From 56b054fae0e908336bc938870a45e098f8761c63 Mon Sep 17 00:00:00 2001 From: Michal Vanko Date: Fri, 20 Nov 2020 14:49:49 +0100 Subject: [PATCH] Restart amplify lets go --- amplify/.config/project-config.json | 30 ++--- amplify/backend/backend-config.json | 7 +- .../hosting/S3AndCloudFront/parameters.json | 3 - .../hosting/S3AndCloudFront/template.json | 113 ------------------ amplify/team-provider-info.json | 35 ++---- 5 files changed, 28 insertions(+), 160 deletions(-) delete mode 100644 amplify/backend/hosting/S3AndCloudFront/parameters.json delete mode 100644 amplify/backend/hosting/S3AndCloudFront/template.json diff --git a/amplify/.config/project-config.json b/amplify/.config/project-config.json index 4211584..0c93113 100644 --- a/amplify/.config/project-config.json +++ b/amplify/.config/project-config.json @@ -1,17 +1,17 @@ { - "projectName": "michalvankodev", - "version": "2.0", - "frontend": "javascript", - "javascript": { - "framework": "none", - "config": { - "SourceDir": "src", - "DistributionDir": "__sapper__/export", - "BuildCommand": "npm run-script export", - "StartCommand": "npm run-script start" - } - }, - "providers": [ - "awscloudformation" - ] + "projectName": "michalvankodev", + "version": "3.0", + "frontend": "javascript", + "javascript": { + "framework": "none", + "config": { + "SourceDir": "src", + "DistributionDir": "__sapper__/export", + "BuildCommand": "npm run-script export", + "StartCommand": "npm run-script start" + } + }, + "providers": [ + "awscloudformation" + ] } \ No newline at end of file diff --git a/amplify/backend/backend-config.json b/amplify/backend/backend-config.json index 0a1e195..ccd70f1 100644 --- a/amplify/backend/backend-config.json +++ b/amplify/backend/backend-config.json @@ -1,8 +1,3 @@ { - "hosting": { - "S3AndCloudFront": { - "service": "S3AndCloudFront", - "providerPlugin": "awscloudformation" - } - } + "hosting": {} } \ No newline at end of file diff --git a/amplify/backend/hosting/S3AndCloudFront/parameters.json b/amplify/backend/hosting/S3AndCloudFront/parameters.json deleted file mode 100644 index 2f428b8..0000000 --- a/amplify/backend/hosting/S3AndCloudFront/parameters.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bucketName": "michalvankodev-20190712100852-hostingbucket" -} \ No newline at end of file diff --git a/amplify/backend/hosting/S3AndCloudFront/template.json b/amplify/backend/hosting/S3AndCloudFront/template.json deleted file mode 100644 index d98d689..0000000 --- a/amplify/backend/hosting/S3AndCloudFront/template.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "AWSTemplateFormatVersion": "2010-09-09", - "Description": "Hosting resource stack creation using Amplify CLI", - "Parameters": { - "env": { - "Type": "String" - }, - "bucketName": { - "Type": "String" - } - }, - "Conditions": { - "ShouldNotCreateEnvResources": { - "Fn::Equals": [ - { - "Ref": "env" - }, - "NONE" - ] - } - }, - "Resources": { - "S3Bucket": { - "Type": "AWS::S3::Bucket", - "DeletionPolicy": "Retain", - "Properties": { - "BucketName": { - "Fn::If": [ - "ShouldNotCreateEnvResources", - { - "Ref": "bucketName" - }, - { - "Fn::Join": [ - "", - [ - { - "Ref": "bucketName" - }, - "-", - { - "Ref": "env" - } - ] - ] - } - ] - }, - "AccessControl": "Private", - "WebsiteConfiguration": { - "IndexDocument": "index.html", - "ErrorDocument": "index.html" - }, - "CorsConfiguration": { - "CorsRules": [ - { - "AllowedHeaders": [ - "Authorization", - "Content-Length" - ], - "AllowedMethods": [ - "GET" - ], - "AllowedOrigins": [ - "*" - ], - "MaxAge": 3000 - } - ] - } - } - } - }, - "Outputs": { - "Region": { - "Value": { - "Ref": "AWS::Region" - } - }, - "HostingBucketName": { - "Description": "Hosting bucket name", - "Value": { - "Ref": "S3Bucket" - } - }, - "WebsiteURL": { - "Value": { - "Fn::GetAtt": [ - "S3Bucket", - "WebsiteURL" - ] - }, - "Description": "URL for website hosted on S3" - }, - "S3BucketSecureURL": { - "Value": { - "Fn::Join": [ - "", - [ - "https://", - { - "Fn::GetAtt": [ - "S3Bucket", - "DomainName" - ] - } - ] - ] - }, - "Description": "Name of S3 bucket to hold website content" - } - } -} \ No newline at end of file diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json index 476a920..c51f40d 100644 --- a/amplify/team-provider-info.json +++ b/amplify/team-provider-info.json @@ -1,26 +1,15 @@ { - "dev": { - "awscloudformation": { - "AuthRoleName": "michalvankodev-dev-20190712095737-authRole", - "UnauthRoleArn": "arn:aws:iam::359485202421:role/michalvankodev-dev-20190712095737-unauthRole", - "AuthRoleArn": "arn:aws:iam::359485202421:role/michalvankodev-dev-20190712095737-authRole", - "Region": "eu-central-1", - "DeploymentBucketName": "michalvankodev-dev-20190712095737-deployment", - "UnauthRoleName": "michalvankodev-dev-20190712095737-unauthRole", - "StackName": "michalvankodev-dev-20190712095737", - "StackId": "arn:aws:cloudformation:eu-central-1:359485202421:stack/michalvankodev-dev-20190712095737/b705b240-a47a-11e9-8ccd-02c3d40e0dd8" - } - }, - "master": { - "awscloudformation": { - "AuthRoleName": "michalvankodev-master-20190712123826-authRole", - "UnauthRoleArn": "arn:aws:iam::359485202421:role/michalvankodev-master-20190712123826-unauthRole", - "AuthRoleArn": "arn:aws:iam::359485202421:role/michalvankodev-master-20190712123826-authRole", - "Region": "eu-central-1", - "DeploymentBucketName": "michalvankodev-master-20190712123826-deployment", - "UnauthRoleName": "michalvankodev-master-20190712123826-unauthRole", - "StackName": "michalvankodev-master-20190712123826", - "StackId": "arn:aws:cloudformation:eu-central-1:359485202421:stack/michalvankodev-master-20190712123826/2e2fd290-a491-11e9-add7-0aee446e3232" - } + "master": { + "awscloudformation": { + "AuthRoleName": "amplify-michalvankodev-master-144656-authRole", + "UnauthRoleArn": "arn:aws:iam::359485202421:role/amplify-michalvankodev-master-144656-unauthRole", + "AuthRoleArn": "arn:aws:iam::359485202421:role/amplify-michalvankodev-master-144656-authRole", + "Region": "eu-central-1", + "DeploymentBucketName": "amplify-michalvankodev-master-144656-deployment", + "UnauthRoleName": "amplify-michalvankodev-master-144656-unauthRole", + "StackName": "amplify-michalvankodev-master-144656", + "StackId": "arn:aws:cloudformation:eu-central-1:359485202421:stack/amplify-michalvankodev-master-144656/db515160-2b36-11eb-8307-06f86a94f568", + "AmplifyAppId": "d1akpb90cpsot" } + } } \ No newline at end of file