Skip to content

Commit

Permalink
correct staging patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisPates committed Jan 23, 2023
1 parent af8d93c commit 340d4df
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
4 changes: 1 addition & 3 deletions cicd/package/buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ phases:
# Create staging & release variants of the template.yaml
- cp template.yaml staging.yaml
- patch staging.yaml cicd/package/staging.patch
- sam package --no-progressbar --template-file staging.yaml --s3-bucket ${S3Bucket} --output-template-file packaged-staging.yaml

- cp template.yaml release.yaml
- patch release.yaml cicd/package/release.patch

# Package our application with AWS SAM
- sam package --no-progressbar --template-file staging.yaml --s3-bucket ${S3Bucket} --output-template-file packaged-staging.yaml
- sam package --no-progressbar --template-file release.yaml --s3-bucket ${S3Bucket} --output-template-file packaged-release.yaml

post_build:
Expand Down
16 changes: 4 additions & 12 deletions cicd/package/staging.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- ../../template.yaml 2022-09-21 17:41:56.000000000 +0100
+++ template.yaml 2022-09-23 14:46:15.000000000 +0100
--- template.yaml 2022-09-21 17:41:56.000000000 +0100
+++ staging.yaml 2022-11-07 14:42:50.000000000 +0000
@@ -25,7 +25,7 @@
- IncludeGroups

Expand All @@ -9,15 +9,7 @@
Description: Helping you populate AWS SSO directly with your Google Apps users.
Author: Sebastian Doell
SpdxLicenseId: Apache-2.0
@@ -114,6 +114,7 @@
SSOSyncFunction:
Type: AWS::Serverless::Function
Properties:
+ Name: SSOSyncFunction
Runtime: go1.x
Handler: dist/ssosync_linux_amd64_v1/ssosync
Timeout: 300
@@ -142,13 +143,6 @@
@@ -142,13 +142,6 @@
- !Ref AWSGoogleAdminEmail
- !Ref AWSSCIMEndpointSecret
- !Ref AWSSCIMAccessTokenSecret
Expand All @@ -31,7 +23,7 @@

AWSGoogleCredentialsSecret:
Type: "AWS::SecretsManager::Secret"
@@ -173,3 +167,9 @@
@@ -173,3 +166,9 @@
Properties:
Name: SSOSyncSCIMAccessToken
SecretString: !Ref SCIMEndpointAccessToken
Expand Down

0 comments on commit 340d4df

Please sign in to comment.