From 7e1dc7afe348ecc4d71571bfaca7939676fd3bb6 Mon Sep 17 00:00:00 2001 From: Qingchuan Ma Date: Wed, 30 Jun 2021 11:18:16 -0700 Subject: [PATCH 1/3] Add condition to managed bucket policy --- samcli/lib/bootstrap/bootstrap.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/samcli/lib/bootstrap/bootstrap.py b/samcli/lib/bootstrap/bootstrap.py index 81c30c7748d..eaed58d630c 100644 --- a/samcli/lib/bootstrap/bootstrap.py +++ b/samcli/lib/bootstrap/bootstrap.py @@ -73,6 +73,9 @@ def _get_stack_template(): - "/*" Principal: Service: serverlessrepo.amazonaws.com + Condition: + StringEquals: + aws:SourceAccount: !Ref AWS::AccountId Outputs: SourceBucket: From ee0ba5d6a93516dc9eb5e620e89ac0b814a7f4e3 Mon Sep 17 00:00:00 2001 From: Qingchuan Ma Date: Thu, 1 Jul 2021 00:16:44 -0700 Subject: [PATCH 2/3] revert: enable all runtimes in python testing matrix --- appveyor.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e47ea65e818..eb533321fbd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,16 +30,16 @@ environment: AWS_ECR: 'AWS_ECR_37' APPVEYOR_CONSOLE_DISABLE_PTY: true - # - PYTHON_HOME: "C:\\Python38-x64" - # PYTHON_VERSION: '3.8' - # PYTHON_ARCH: '64' - # RUN_SMOKE: 1 - # NOSE_PARAMETERIZED_NO_WARN: 1 - # INSTALL_PY_36_PIP: 1 - # INSTALL_PY_37_PIP: 1 - # AWS_S3: 'AWS_S3_38' - # AWS_ECR: 'AWS_ECR_38' - # APPVEYOR_CONSOLE_DISABLE_PTY: true + - PYTHON_HOME: "C:\\Python38-x64" + PYTHON_VERSION: '3.8' + PYTHON_ARCH: '64' + RUN_SMOKE: 1 + NOSE_PARAMETERIZED_NO_WARN: 1 + INSTALL_PY_36_PIP: 1 + INSTALL_PY_37_PIP: 1 + AWS_S3: 'AWS_S3_38' + AWS_ECR: 'AWS_ECR_38' + APPVEYOR_CONSOLE_DISABLE_PTY: true for: - From fc49e52f4ff5ab81d7f4cce42cda46f7a78637a1 Mon Sep 17 00:00:00 2001 From: Qingchuan Ma Date: Thu, 1 Jul 2021 00:19:25 -0700 Subject: [PATCH 3/3] fix indentation for yml --- appveyor.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index eb533321fbd..ed730e0a24f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,15 +31,15 @@ environment: APPVEYOR_CONSOLE_DISABLE_PTY: true - PYTHON_HOME: "C:\\Python38-x64" - PYTHON_VERSION: '3.8' - PYTHON_ARCH: '64' - RUN_SMOKE: 1 - NOSE_PARAMETERIZED_NO_WARN: 1 - INSTALL_PY_36_PIP: 1 - INSTALL_PY_37_PIP: 1 - AWS_S3: 'AWS_S3_38' - AWS_ECR: 'AWS_ECR_38' - APPVEYOR_CONSOLE_DISABLE_PTY: true + PYTHON_VERSION: '3.8' + PYTHON_ARCH: '64' + RUN_SMOKE: 1 + NOSE_PARAMETERIZED_NO_WARN: 1 + INSTALL_PY_36_PIP: 1 + INSTALL_PY_37_PIP: 1 + AWS_S3: 'AWS_S3_38' + AWS_ECR: 'AWS_ECR_38' + APPVEYOR_CONSOLE_DISABLE_PTY: true for: -