feat: pr comments

aws-amplify · Sep 9, 2021 · c0c01d5 · c0c01d5
1 parent b7dda25
commit c0c01d5
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/containers-handler.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/containers-handler.ts
@@ -6,7 +6,7 @@ import { DEPLOYMENT_MECHANISM } from './base-api-stack';
 import { GitHubSourceActionInfo } from './pipeline-with-awaiter';
 import { API_TYPE, IMAGE_SOURCE_TYPE, ResourceDependency, ServiceConfiguration } from './service-walkthroughs/containers-walkthrough';
 import { ApiResource, generateContainersArtifacts } from './utils/containers-artifacts';
-import { createDefaultCustomPoliciesFile, pathManager } from "amplify-cli-core";
+import { createDefaultCustomPoliciesFile, pathManager } from 'amplify-cli-core';
 
 export const addResource = async (
   serviceWalkthroughPromise: Promise<ServiceConfiguration>,

diff --git a/packages/amplify-category-function/src/provider-utils/awscloudformation/index.ts b/packages/amplify-category-function/src/provider-utils/awscloudformation/index.ts
@@ -121,7 +121,6 @@ export async function addFunctionResource(
 
   const { print } = context;
 
-
   const customPoliciesPath = pathManager.getCustomPoliciesPath(category, completeParams.resourceName);
 
   print.success(`Successfully added resource ${completeParams.resourceName} locally.`);

diff --git a/packages/amplify-cli-core/src/__tests__/customPoliciesUtils.test.ts b/packages/amplify-cli-core/src/__tests__/customPoliciesUtils.test.ts
@@ -1,6 +1,6 @@
-import {createDefaultCustomPoliciesFile} from "../customPoliciesUtils"
-import { JSONUtilities } from "..";
-import { pathManager, PathConstants } from "../state-manager";
+import {createDefaultCustomPoliciesFile} from '../customPoliciesUtils'
+import { JSONUtilities } from '..';
+import { pathManager, PathConstants } from '../state-manager';
 import path from 'path';
 
 describe('Custom policies util test', () => {

diff --git a/packages/amplify-cli-core/src/customPoliciesUtils.ts b/packages/amplify-cli-core/src/customPoliciesUtils.ts
@@ -1,5 +1,4 @@
 import { Fn, IAM } from 'cloudform-types';
-import * as iam from '@aws-cdk/aws-iam';
 import { JSONUtilities, pathManager } from '.';
 
 export type CustomIAMPolicies = CustomIAMPolicy[];
@@ -17,7 +16,7 @@ export const CustomIAMPoliciesSchema = {
     type: 'object',
     properties: {
       Action: { type: 'array', items: { type: 'string' }, minItems: 1, nullable: false },
-      Effect: {type: 'string', nullable: true, default: iam.Effect.ALLOW},
+      Effect: {enum:['Allow', 'Deny'], nullable: true, default: 'Allow'},
       Resource: { type: 'array', items: { type: 'string' }, minItems: 1, nullable: false},
     },
     required: ['Resource', 'Action'],

diff --git a/packages/amplify-cli-core/src/index.ts b/packages/amplify-cli-core/src/index.ts
@@ -24,7 +24,7 @@ export * from './cliGetCategories';
 export * from './cliRemoveResourcePrompt';
 export * from './cliViewAPI';
 export * from './hooks';
-export * from "./cliViewAPI";
+export * from './cliViewAPI';
 export * from './customPoliciesUtils'
 
 // Temporary types until we can finish full type definition across the whole CLI

diff --git a/...provider-awscloudformation/src/__tests__/pre-push-cfn-processor/cfn-pre-processor.test.ts b/...provider-awscloudformation/src/__tests__/pre-push-cfn-processor/cfn-pre-processor.test.ts
@@ -68,8 +68,8 @@ describe('preProcessCFNTemplate', () => {
   it('writes valid custom policies to cfn template', async () => {
     const cfnTemplate = ({
       Resources: {
-        "LambdaExecutionRole": {
-          "Type": "AWS::IAM::Role"
+        LambdaExecutionRole: {
+          Type: 'AWS::IAM::Role'
         }
       },
     } as unknown) as Template;

diff --git a/packages/amplify-provider-awscloudformation/src/pre-push-cfn-processor/cfn-pre-processor.ts b/packages/amplify-provider-awscloudformation/src/pre-push-cfn-processor/cfn-pre-processor.ts
@@ -15,7 +15,6 @@ import { prePushCfnTemplateModifier } from './pre-push-cfn-modifier';
 import { Fn, Template } from 'cloudform-types';
 import { printer } from 'amplify-prompts';
 import Ajv from 'ajv';
-import * as iam from '@aws-cdk/aws-iam';
 
 
 const buildDir = 'build';
@@ -84,11 +83,11 @@ async function addCustomPoliciesToCFNTemplate(
   resourceName: string
   ) {
   let customExecutionPolicy;
-  if(service === 'Lambda') {
+  if (service === 'Lambda') {
     customExecutionPolicy = customExecutionPolicyForFunction;
   }
   if (service === 'ElasticContainer') {
-    const roleName = cfnTemplate.Resources.TaskDefinition.Properties.ExecutionRoleArn["Fn::GetAtt"][0];
+    const roleName = cfnTemplate.Resources.TaskDefinition.Properties.ExecutionRoleArn['Fn::GetAtt'][0];
     customExecutionPolicy = customExecutionPolicyForContainer;
     const role = Fn.Ref(roleName);
     customExecutionPolicy.Properties.Roles.push(role);
@@ -99,7 +98,7 @@ async function addCustomPoliciesToCFNTemplate(
   for (const customPolicy of customPolicies) {
     validateCustomPolicy(customPolicy, category, resourceName);
     const policyWithEnv = replaceEnvForCustomPolicies(customPolicy);
-    if (!policyWithEnv.Effect) policyWithEnv.Effect = iam.Effect.ALLOW;
+    if (!policyWithEnv.Effect) policyWithEnv.Effect = 'Allow';
     customExecutionPolicy.Properties.PolicyDocument.Statement.push(policyWithEnv);
   }