Merge branch 'main' into release-please--branches--main--components--netlify-cli

Author: khendrikse

src/commands/integration/deploy.ts

@@ -85,7 +85,7 @@ function formatScopesForRemote(scopes) {
 }
 
 // @ts-expect-error TS(7006) FIXME: Parameter 'name' implicitly has an 'any' type.
-function verifyRequiredFieldsAreInConfig(name, description, scopes, integrationLevel) {
+function verifyRequiredFieldsAreInConfig(name, description, scopes) {
   const missingFields = []
 
   if (!name) {
@@ -97,9 +97,6 @@ function verifyRequiredFieldsAreInConfig(name, description, scopes, integrationL
   if (!scopes) {
     missingFields.push('scopes')
   }
-  if (!integrationLevel) {
-    missingFields.push('integrationLevel')
-  }
   if (missingFields.length !== 0) {
     log(
       chalk.yellow(
@@ -120,7 +117,7 @@ function verifyRequiredFieldsAreInConfig(name, description, scopes, integrationL
 
 // @ts-expect-error TS(7006) FIXME: Parameter 'workingDir' implicitly has an 'any' typ... Remove this comment to see the full error message
 export async function registerIntegration(workingDir, siteId, accountId, localIntegrationConfig, token) {
-  const { description, integrationLevel, name, scopes, slug } = localIntegrationConfig
+  const { description, name, scopes, slug } = localIntegrationConfig
   log(chalk.yellow(`An integration associated with the site ID ${siteId} is not registered.`))
   const registerPrompt = await inquirer.prompt([
     {
@@ -145,7 +142,7 @@ export async function registerIntegration(workingDir, siteId, accountId, localIn
     exit(1)
   }
 
-  if (!verifyRequiredFieldsAreInConfig(name, description, scopes, integrationLevel)) {
+  if (!verifyRequiredFieldsAreInConfig(name, description, scopes)) {
     exit(1)
   }
 
@@ -162,7 +159,6 @@ export async function registerIntegration(workingDir, siteId, accountId, localIn
       description,
       hostSiteId: siteId,
       scopes: formatScopesForRemote(scopes),
-      integrationLevel,
     }),
   }).then(async (res) => {
     const response = await res.json()
@@ -186,7 +182,7 @@ export async function registerIntegration(workingDir, siteId, accountId, localIn
 
   const updatedIntegrationConfig = yaml.dump({
     // @ts-expect-error TS(18046) - 'body' is of type 'unknown'
-    config: { name, description, slug: body.slug, scopes, integrationLevel },
+    config: { name, description, slug: body.slug, scopes },
   })
 
   const filePath = resolve(workingDir, 'integration.yaml')
@@ -211,7 +207,7 @@ export async function updateIntegration(
   // @ts-expect-error TS(7006) FIXME: Parameter 'registeredIntegration' implicitly has a... Remove this comment to see the full error message
   registeredIntegration,
 ) {
-  let { description, integrationLevel, name, scopes, slug } = localIntegrationConfig
+  let { description, name, scopes, slug } = localIntegrationConfig
 
   let integrationSlug = slug
   if (slug !== registeredIntegration.slug) {
@@ -232,11 +228,6 @@ export async function updateIntegration(
     description = registeredIntegration.description
   }
 
-  if (!integrationLevel) {
-    // eslint-disable-next-line prefer-destructuring
-    integrationLevel = registeredIntegration.integrationLevel
-  }
-
   // This is returned as a comma separated string and will be easier to manage here as an array
   const registeredIntegrationScopes = registeredIntegration.scopes.split(',')
 
@@ -287,7 +278,6 @@ export async function updateIntegration(
             hostSiteId: siteId,
             // @ts-expect-error TS(7005) FIXME: Variable 'localScopes' implicitly has an 'any[]' t... Remove this comment to see the full error message
             scopes: localScopes.join(','),
-            integrationLevel,
           }),
         },
       ).then(async (res) => {
@@ -325,7 +315,7 @@ export async function updateIntegration(
     }
 
     const updatedIntegrationConfig = yaml.dump({
-      config: { name, description, slug: integrationSlug, scopes: scopesToWrite, integrationLevel },
+      config: { name, description, slug: integrationSlug, scopes: scopesToWrite },
     })
 
     const filePath = resolve(workingDir, 'integration.yaml')
@@ -348,7 +338,6 @@ const IntegrationConfigurationSchema = z.object({
       user: z.array(z.enum(['read', 'write'])).optional(),
     })
     .optional(),
-  integrationLevel: z.enum(['site', 'team', 'team-and-site']).optional(),
 })
 
 // @ts-expect-error TS(7006) FIXME: Parameter 'workingDir' implicitly has an 'any' typ... Remove this comment to see the full error message
@@ -409,8 +398,8 @@ export const deploy = async (options: OptionValues, command: BaseCommand) => {
   // Confirm that a site is linked and that the user is logged in
   checkOptions(buildOptions)
 
-  const { description, integrationLevel, name, scopes, slug } = await getConfiguration(command.workingDir)
-  const localIntegrationConfig = { name, description, scopes, slug, integrationLevel }
+  const { description, name, scopes, slug } = await getConfiguration(command.workingDir)
+  const localIntegrationConfig = { name, description, scopes, slug }
 
   const headers = token ? { 'netlify-token': token } : undefined
   // @ts-expect-error TS(2345) FIXME: Argument of type '{ api: any; site: any; siteInfo:... Remove this comment to see the full error message

tests/integration/commands/integration/deploy.test.ts

@@ -90,7 +90,6 @@ describe(`integration:deploy`, () => {
   scopes:
     site:
         - read
-  integrationLevel: team-and-site
       `,
         },
       ])