Skip to content

Commit

Permalink
feat: minor bump no-op
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Lazar committed Oct 14, 2022
1 parent 8803dda commit 9fb0c27
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
} from 'amplify-cli-core';
import fs from 'fs-extra';
import * as path from 'path';
import { pinpointHasInAppMessagingPolicy } from '../utils/pinpoint-helper';
import { pinpointHasInAppMessagingPolicy, pinpointInAppMessagingPolicyName } from '../utils/pinpoint-helper';

/**
* checks if the project has been migrated to the latest version of in-app messaging
Expand All @@ -20,15 +20,15 @@ export const inAppMessagingMigrationCheck = async (context: $TSContext): Promise
const cfn = JSONUtilities.readJson(templateFilePath);
const updatedCfn = migratePinpointCFN(cfn);
fs.ensureDirSync(resourcePath);
fs.writeFileSync(templateFilePath, JSON.stringify(updatedCfn, null, 4), 'utf8');
JSONUtilities.writeJson(templateFilePath, updatedCfn);
});
}
};

const migratePinpointCFN = (cfn: $TSAny): $TSAny => {
const { Parameters, Conditions, Resources } = cfn;

Parameters.pinpointInAppMessagingPolicyName = {
Parameters[pinpointInAppMessagingPolicyName] = {
Type: 'String',
Default: 'NONE',
};
Expand Down
22 changes: 12 additions & 10 deletions packages/amplify-category-analytics/src/utils/pinpoint-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { printer } from 'amplify-prompts';
import * as path from 'path';
import { getAnalyticsResources } from './analytics-helper';

export const pinpointInAppMessagingPolicyName = 'pinpointInAppMessagingPolicyName';

/**
* opens resource in AWS console
*/
Expand Down Expand Up @@ -69,16 +71,16 @@ export const hasResource = (context: $TSContext): boolean => {
*/
export const pinpointHasInAppMessagingPolicy = (context: $TSContext): boolean => {
const resources = getAnalyticsResources(context, AmplifySupportedService.PINPOINT);
if (resources?.length > 0) {
const pinpointCloudFormationTemplatePath = path.join(
pathManager.getBackendDirPath(),
AmplifyCategories.ANALYTICS,
resources[0].resourceName,
`pinpoint-cloudformation-template.json`,
);
const { cfnTemplate } = readCFNTemplate(pinpointCloudFormationTemplatePath, { throwIfNotExist: false }) || {};
return !!cfnTemplate?.Parameters?.pinpointInAppMessagingPolicyName;
if (resources?.length === 0) {
return false;
}

return false;
const pinpointCloudFormationTemplatePath = path.join(
pathManager.getBackendDirPath(),
AmplifyCategories.ANALYTICS,
resources[0].resourceName,
`pinpoint-cloudformation-template.json`,
);
const { cfnTemplate } = readCFNTemplate(pinpointCloudFormationTemplatePath, { throwIfNotExist: false }) || {};
return !!cfnTemplate?.Parameters?.[pinpointInAppMessagingPolicyName];
};
2 changes: 1 addition & 1 deletion packages/amplify-category-auth/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ async function isSMSWorkflowEnabled(context, resourceName) {
* @param {Object} context - The amplify context.
*/
const authPushYes = async context => {
const exeInfoClone = Object.assign({}, (context.exeInfo) || {});
const exeInfoClone = { ...context?.exeInfo };
try {
context.exeInfo = (context.exeInfo) || {};
context.exeInfo.inputParams = (context.exeInfo.inputParams) || {};
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli-npm/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ export const install = async (): Promise<void> => {
};

// force minor version bump
// -
// --

0 comments on commit 9fb0c27

Please sign in to comment.