fix: rebase fixes and bugs (#8960)

* fix: rebase fixes and bugs * fix: service walkthrough call for appsync
aws-amplify · Nov 20, 2021 · 7413d29 · 7413d29
1 parent 6180642
commit 7413d29
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/...ges/amplify-category-api/src/provider-utils/awscloudformation/cfn-api-artifact-handler.ts b/...ges/amplify-category-api/src/provider-utils/awscloudformation/cfn-api-artifact-handler.ts
@@ -111,7 +111,7 @@ class CfnApiArtifactHandler implements ApiArtifactHandler {
     const resourceDir = this.getResourceDir(apiName);
     // update appsync cli-inputs
     const appsyncCLIInputs = await this.updateAppsyncCLIInputs(updates, apiName);
-    if (updates.transformSchema) {
+    if (!_.isEmpty(updates.transformSchema)) {
       this.writeSchema(appsyncCLIInputs.serviceConfiguration.gqlSchemaPath, updates.transformSchema);
     }
     if (updates.conflictResolution) {
@@ -123,11 +123,10 @@ class CfnApiArtifactHandler implements ApiArtifactHandler {
     const previousAuthConfig = _.cloneDeep(authConfig);
     const oldConfigHadApiKey = authConfigHasApiKey(authConfig);
     if (updates.defaultAuthType) {
-      authConfig.defaultAuthentication = appSyncAuthTypeToAuthConfig(appsyncCLIInputs.serviceConfiguration.defaultAuthType);
+      authConfig.defaultAuthentication = appSyncAuthTypeToAuthConfig(updates.defaultAuthType);
     }
     if (updates.additionalAuthTypes) {
-      authConfig.additionalAuthenticationProviders =
-        appsyncCLIInputs.serviceConfiguration.additionalAuthTypes.map(appSyncAuthTypeToAuthConfig);
+      authConfig.additionalAuthenticationProviders = updates.additionalAuthTypes.map(appSyncAuthTypeToAuthConfig);
     }
 
     if (!opts?.skipCompile) {
@@ -304,13 +303,13 @@ class CfnApiArtifactHandler implements ApiArtifactHandler {
     const prevAppsyncInputs = cliState.getCLIInputPayload();
 
     const appsyncInputs: AppSyncCLIInputs = prevAppsyncInputs;
-    if (!_.isEmpty(updates.conflictResolution)) {
+    if (updates.conflictResolution) {
       appsyncInputs.serviceConfiguration.conflictResolution = updates.conflictResolution;
     }
-    if (!_.isEmpty(updates.defaultAuthType)) {
+    if (updates.defaultAuthType) {
       appsyncInputs.serviceConfiguration.defaultAuthType = updates.defaultAuthType;
     }
-    if (!_.isEmpty(updates.additionalAuthTypes)) {
+    if (updates.additionalAuthTypes) {
       appsyncInputs.serviceConfiguration.additionalAuthTypes = updates.additionalAuthTypes;
     }
     cliState.saveCLIInputPayload(appsyncInputs);

diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/index.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/index.ts
@@ -68,7 +68,7 @@ async function addNonContainerResource(context: $TSContext, service: string, opt
   const { serviceWalkthroughFilename, defaultValuesFilename } = serviceMetadata;
   const serviceWalkthrough = await getServiceWalkthrough(serviceWalkthroughFilename);
 
-  const serviceWalkthroughPromise: Promise<$TSAny> = serviceWalkthrough(context, defaultValuesFilename, serviceMetadata);
+  const serviceWalkthroughPromise: Promise<$TSAny> = serviceWalkthrough(context, serviceMetadata);
   switch (service) {
     case AmplifySupportedService.APPSYNC:
       const walkthroughResult = await serviceWalkthroughPromise;

diff --git a/...-category-api/src/provider-utils/awscloudformation/utils/migrate-api-override-resource.ts b/...-category-api/src/provider-utils/awscloudformation/utils/migrate-api-override-resource.ts
@@ -12,7 +12,7 @@ import * as fs from 'fs-extra';
 import { ResolverConfig } from 'graphql-transformer-core';
 import _ from 'lodash';
 import * as path from 'path';
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { gqlSchemaFilename } from '../aws-constants';
 import { AppSyncCLIInputs } from '../service-walkthrough-types/appsync-user-input-types';
 import { authConfigToAppSyncAuthType } from './auth-config-to-app-sync-auth-type-bi-di-mapper';
@@ -109,7 +109,7 @@ const generateCliInputs = (parameters: ApiMetaData, apiResourceDir: string): App
       serviceName: 'AppSync',
       defaultAuthType: authConfigToAppSyncAuthType(parameters.authConfig ? parameters.authConfig.defaultAuthentication : undefined),
       additionalAuthTypes:
-        parameters.authConfig && parameters.authConfig.additionalAuthenticationProviders
+        !_.isEmpty(parameters.authConfig) && !_.isEmpty(parameters.authConfig.additionalAuthenticationProviders)
           ? parameters.authConfig.additionalAuthenticationProviders.map(authConfigToAppSyncAuthType)
           : undefined,
       conflictResolution: resolverConfigToConflictResolution(parameters.resolverConfig),