swap out flutter-release-github-token for pub-roller-github-token
This is using the already generated and in cloudkms token from go/flutter-github-bots#steps-to-provision-a-new-github-access-token.
If this doesn't work, we will probably need to generate a new GitHub
account, and a new token, and encrypt it and upload it to cloudkms.
Bug: https://github.com/flutter/flutter/issues/162544
Change-Id: If1e26d9b44259501d2faaea5a8b7448dcc19380d
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/62800
Reviewed-by: Reid Baker <reidbaker@google.com>
Commit-Queue: Christopher Fujino <fujino@google.com>
diff --git a/recipes/release/release_publish.expected/monorepo_1.2.3-4.5.pre_beta.json b/recipes/release/release_publish.expected/monorepo_1.2.3-4.5.pre_beta.json
index 24eaa87..db320e3 100644
--- a/recipes/release/release_publish.expected/monorepo_1.2.3-4.5.pre_beta.json
+++ b/recipes/release/release_publish.expected/monorepo_1.2.3-4.5.pre_beta.json
@@ -236,8 +236,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/flutter",
"env": {
@@ -266,7 +266,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -301,7 +301,7 @@
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/release/release_publish.expected/monorepo_1.2.3-4.5.pre_beta_force.json b/recipes/release/release_publish.expected/monorepo_1.2.3-4.5.pre_beta_force.json
index 24eaa87..db320e3 100644
--- a/recipes/release/release_publish.expected/monorepo_1.2.3-4.5.pre_beta_force.json
+++ b/recipes/release/release_publish.expected/monorepo_1.2.3-4.5.pre_beta_force.json
@@ -236,8 +236,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/flutter",
"env": {
@@ -266,7 +266,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -301,7 +301,7 @@
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/release/release_publish.expected/monorepo_1.2.3_stable.json b/recipes/release/release_publish.expected/monorepo_1.2.3_stable.json
index c187e2b..6130998 100644
--- a/recipes/release/release_publish.expected/monorepo_1.2.3_stable.json
+++ b/recipes/release/release_publish.expected/monorepo_1.2.3_stable.json
@@ -236,8 +236,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/flutter",
"env": {
@@ -266,7 +266,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -301,7 +301,7 @@
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/release/release_publish.expected/monorepo_1.2.3_stable_force.json b/recipes/release/release_publish.expected/monorepo_1.2.3_stable_force.json
index c187e2b..6130998 100644
--- a/recipes/release/release_publish.expected/monorepo_1.2.3_stable_force.json
+++ b/recipes/release/release_publish.expected/monorepo_1.2.3_stable_force.json
@@ -236,8 +236,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/flutter",
"env": {
@@ -266,7 +266,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -301,7 +301,7 @@
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/release/release_publish.expected/non-monorepo_1.2.3-4.5.pre_beta.json b/recipes/release/release_publish.expected/non-monorepo_1.2.3-4.5.pre_beta.json
index 3544282..cbfc4bf 100644
--- a/recipes/release/release_publish.expected/non-monorepo_1.2.3-4.5.pre_beta.json
+++ b/recipes/release/release_publish.expected/non-monorepo_1.2.3-4.5.pre_beta.json
@@ -354,8 +354,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/flutter",
"env": {
@@ -384,7 +384,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -419,7 +419,7 @@
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -506,8 +506,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/engine",
"env": {
@@ -541,7 +541,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -587,7 +587,7 @@
"ENGINE_CHECKOUT_PATH": "[START_DIR]/engine",
"ENGINE_PATH": "[START_DIR]/engine",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/release/release_publish.expected/non-monorepo_1.2.3-4.5.pre_beta_force.json b/recipes/release/release_publish.expected/non-monorepo_1.2.3-4.5.pre_beta_force.json
index 3544282..cbfc4bf 100644
--- a/recipes/release/release_publish.expected/non-monorepo_1.2.3-4.5.pre_beta_force.json
+++ b/recipes/release/release_publish.expected/non-monorepo_1.2.3-4.5.pre_beta_force.json
@@ -354,8 +354,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/flutter",
"env": {
@@ -384,7 +384,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -419,7 +419,7 @@
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -506,8 +506,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/engine",
"env": {
@@ -541,7 +541,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -587,7 +587,7 @@
"ENGINE_CHECKOUT_PATH": "[START_DIR]/engine",
"ENGINE_PATH": "[START_DIR]/engine",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/release/release_publish.expected/non-monorepo_1.2.3_stable.json b/recipes/release/release_publish.expected/non-monorepo_1.2.3_stable.json
index 61cc224..0d9edaf 100644
--- a/recipes/release/release_publish.expected/non-monorepo_1.2.3_stable.json
+++ b/recipes/release/release_publish.expected/non-monorepo_1.2.3_stable.json
@@ -354,8 +354,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/flutter",
"env": {
@@ -384,7 +384,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -419,7 +419,7 @@
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -506,8 +506,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/engine",
"env": {
@@ -541,7 +541,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -587,7 +587,7 @@
"ENGINE_CHECKOUT_PATH": "[START_DIR]/engine",
"ENGINE_PATH": "[START_DIR]/engine",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/release/release_publish.expected/non-monorepo_1.2.3_stable_force.json b/recipes/release/release_publish.expected/non-monorepo_1.2.3_stable_force.json
index 61cc224..0d9edaf 100644
--- a/recipes/release/release_publish.expected/non-monorepo_1.2.3_stable_force.json
+++ b/recipes/release/release_publish.expected/non-monorepo_1.2.3_stable_force.json
@@ -354,8 +354,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/flutter",
"env": {
@@ -384,7 +384,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -419,7 +419,7 @@
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -506,8 +506,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter-release-github-token.encrypted",
- "[CLEANUP]/flutter-release-github-token.encrypted"
+ "gs://flutter_configs/pub-roller-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted"
],
"cwd": "[START_DIR]/engine",
"env": {
@@ -541,7 +541,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter-release-github-token.encrypted",
+ "[CLEANUP]/pub-roller-github-token.encrypted",
"-output",
"[CLEANUP]/token.txt",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -587,7 +587,7 @@
"ENGINE_CHECKOUT_PATH": "[START_DIR]/engine",
"ENGINE_PATH": "[START_DIR]/engine",
"FORCE_FLAG": "--force",
- "GITHUB_USER": "fluttergithubbot",
+ "GITHUB_USER": "flutter-pub-roller-bot",
"GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/release/release_publish.py b/recipes/release/release_publish.py
index 710e255..3aaebba 100644
--- a/recipes/release/release_publish.py
+++ b/recipes/release/release_publish.py
@@ -143,7 +143,9 @@
with api.context(env=env, env_prefixes=env_prefixes, cwd=checkout):
token_decrypted = api.path.cleanup_dir / 'token.txt'
api.kms.get_secret(
- 'flutter-release-github-token.encrypted', token_decrypted
+ # TODO(fujino): restore this to 'flutter-release-github-token.encrypted'
+ # once https://github.com/flutter/flutter/issues/162544 is resolved
+ 'pub-roller-github-token.encrypted', token_decrypted
)
env['FORCE_FLAG'] = '--force' if force else ''
@@ -152,7 +154,9 @@
env['REL_HASH'] = rel_hash
env['RELEASE_CHANNEL'] = release_channel
env['GIT_BRANCH'] = git_branch
- env['GITHUB_USER'] = 'fluttergithubbot'
+ # TODO(fujino) restore this to 'fluttergithubbot' once
+ # https://github.com/flutter/flutter/issues/162544 is resolved
+ env['GITHUB_USER'] = 'flutter-pub-roller-bot'
env['REPO'] = 'flutter' if repo == 'flutter' else 'engine'
# Run script within a new context to use the new env variables.
