Admin: Ensure Automatic data update scripts use a unique branch (#5947)

getmoto · Feb 19, 2023 · 046d765 · 046d765
1 parent efb13a1
commit 046d765
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/data-update_ec2-instance-offerings.yml b/.github/workflows/data-update_ec2-instance-offerings.yml
@@ -47,5 +47,5 @@ jobs:
         COMMIT_MESSAGE: 'chore: update EC2 Instance Offerings'
         COMMIT_NAME: 'Moto Admin'
         COMMIT_EMAIL: '[email protected]'
-        PR_BRANCH_NAME: 'chore-update-${PR_ID}'
+        PR_BRANCH_NAME: 'chore-update-ec2-offerings-${PR_ID}'
         PR_TITLE: 'chore: update EC2 Instance Offerings'
diff --git a/.github/workflows/data-update_ec2-instance-types.yml b/.github/workflows/data-update_ec2-instance-types.yml
@@ -46,5 +46,5 @@ jobs:
         COMMIT_MESSAGE: 'chore: update EC2 Instance Types'
         COMMIT_NAME: 'Moto Admin'
         COMMIT_EMAIL: '[email protected]'
-        PR_BRANCH_NAME: 'chore-update-${PR_ID}'
+        PR_BRANCH_NAME: 'chore-update-ec2-types-${PR_ID}'
         PR_TITLE: 'chore: update EC2 Instance Types'
diff --git a/.github/workflows/data-update_ssm-default-amis.yml b/.github/workflows/data-update_ssm-default-amis.yml
@@ -43,9 +43,10 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.PR_ACCESS_TOKEN }}
         EXECUTE_COMMANDS: |
           pip install boto3
+          pip install moto
           python scripts/ssm_get_default_amis.py
         COMMIT_MESSAGE: "chore: update SSM default AMI's"
         COMMIT_NAME: 'Moto Admin'
         COMMIT_EMAIL: '[email protected]'
-        PR_BRANCH_NAME: 'chore-update-${PR_ID}'
+        PR_BRANCH_NAME: 'chore-update-ssm-amis-${PR_ID}'
         PR_TITLE: "chore: update SSM Instance AMI's"
diff --git a/.github/workflows/data-update_ssm-default-parameters.yml b/.github/workflows/data-update_ssm-default-parameters.yml
@@ -43,9 +43,10 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.PR_ACCESS_TOKEN }}
         EXECUTE_COMMANDS: |
           pip install boto3
+          pip install moto
           python scripts/ssm_get_default_params.py
         COMMIT_MESSAGE: "chore: update SSM default parameters"
         COMMIT_NAME: 'Moto Admin'
         COMMIT_EMAIL: '[email protected]'
-        PR_BRANCH_NAME: 'chore-update-${PR_ID}'
+        PR_BRANCH_NAME: 'chore-update-ssm-params-${PR_ID}'
         PR_TITLE: "chore: update SSM Instance parameters"
diff --git a/scripts/ssm_get_default_params.py b/scripts/ssm_get_default_params.py
@@ -2,7 +2,6 @@
 import json
 import os
 import subprocess
-import sure  # noqa # pylint: disable=unused-import
 import time
 
 from moto.ssm.utils import convert_to_tree