Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use old github token if new tokens are not available #10114

Merged
merged 4 commits into from
Mar 5, 2024
Merged

Use old github token if new tokens are not available #10114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0edda5c
Use old github token if new tokens are not available
trodge Mar 4, 2024
c5be622
Add lookup function for github token or fallback
trodge Mar 5, 2024
c10679b
Add fall back
trodge Mar 5, 2024
c9020b4
Add fallback
trodge Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions .ci/magician/cmd/check_cassettes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

var ccEnvironmentVariables = [...]string{
"COMMIT_SHA",
"GITHUB_TOKEN_DOWNSTREAMS",
"GOCACHE",
"GOPATH",
"GOOGLE_BILLING_ACCOUNT",
Expand Down Expand Up @@ -56,13 +55,19 @@ var checkCassettesCmd = &cobra.Command{
env[ev] = val
}

githubToken, ok := lookupGithubTokenOrFallback("GITHUB_TOKEN_DOWNSTREAMS")
if !ok {
fmt.Println("Did not provide GITHUB_TOKEN_DOWNSTREAMS or GITHUB_TOKEN environment variables")
os.Exit(1)
}

rnr, err := exec.NewRunner()
if err != nil {
fmt.Println("Error creating Runner: ", err)
os.Exit(1)
}

ctlr := source.NewController(env["GOPATH"], "modular-magician", env["GITHUB_TOKEN_DOWNSTREAMS"], rnr)
ctlr := source.NewController(env["GOPATH"], "modular-magician", githubToken, rnr)

vt, err := vcr.NewTester(env, rnr)
if err != nil {
Expand All @@ -73,6 +78,14 @@ var checkCassettesCmd = &cobra.Command{
},
}

func lookupGithubTokenOrFallback(tokenName string) (string, bool) {
val, ok := os.LookupEnv(tokenName)
if !ok {
return os.LookupEnv("GITHUB_TOKEN")
}
return val, ok
}

func listCCEnvironmentVariables() string {
var result string
for i, ev := range ccEnvironmentVariables {
Expand Down
4 changes: 2 additions & 2 deletions .ci/magician/cmd/community_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ var communityApprovalCmd = &cobra.Command{
baseBranch := args[5]
fmt.Println("Base Branch: ", baseBranch)

githubToken, ok := os.LookupEnv("GITHUB_TOKEN_MAGIC_MODULES")
githubToken, ok := lookupGithubTokenOrFallback("GITHUB_TOKEN_MAGIC_MODULES")
if !ok {
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES environment variable")
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES or GITHUB_TOKEN environment variables")
os.Exit(1)
}
gh := github.NewClient(githubToken)
Expand Down
10 changes: 8 additions & 2 deletions .ci/magician/cmd/generate_comment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ var gcEnvironmentVariables = [...]string{
"BUILD_ID",
"BUILD_STEP",
"COMMIT_SHA",
"GITHUB_TOKEN_DOWNSTREAMS",
"GITHUB_TOKEN_MAGIC_MODULES",
"GOPATH",
"HOME",
"PATH",
Expand Down Expand Up @@ -71,6 +69,14 @@ var generateCommentCmd = &cobra.Command{
env[ev] = val
}

for _, tokenName := range []string{"GITHUB_TOKEN_DOWNSTREAMS", "GITHUB_TOKEN_MAGIC_MODULES"} {
val, ok := lookupGithubTokenOrFallback(tokenName)
if !ok {
fmt.Printf("Did not provide %s or GITHUB_TOKEN environment variable\n", tokenName)
os.Exit(1)
}
env[tokenName] = val
trodge marked this conversation as resolved.
Show resolved Hide resolved
}
gh := github.NewClient(env["GITHUB_TOKEN_MAGIC_MODULES"])
rnr, err := exec.NewRunner()
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions .ci/magician/cmd/generate_downstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ var gdEnvironmentVariables = [...]string{
var gdTokenEnvironmentVariables = [...]string{
"GITHUB_TOKEN_CLASSIC",
"GITHUB_TOKEN_DOWNSTREAMS",
"GITHUB_TOKEN",
melinath marked this conversation as resolved.
Show resolved Hide resolved
}

var generateDownstreamCmd = &cobra.Command{
Expand Down
4 changes: 2 additions & 2 deletions .ci/magician/cmd/membership_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ var membershipCheckerCmd = &cobra.Command{
baseBranch := args[5]
fmt.Println("Base Branch: ", baseBranch)

githubToken, ok := os.LookupEnv("GITHUB_TOKEN_MAGIC_MODULES")
githubToken, ok := lookupGithubTokenOrFallback("GITHUB_TOKEN_MAGIC_MODULES")
if !ok {
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES environment variable")
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES or GITHUB_TOKEN environment variables")
os.Exit(1)
}
gh := github.NewClient(githubToken)
Expand Down
4 changes: 2 additions & 2 deletions .ci/magician/cmd/request_service_reviewers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ var requestServiceReviewersCmd = &cobra.Command{
prNumber := args[0]
fmt.Println("PR Number: ", prNumber)

githubToken, ok := os.LookupEnv("GITHUB_TOKEN_MAGIC_MODULES")
githubToken, ok := lookupGithubTokenOrFallback("GITHUB_TOKEN_MAGIC_MODULES")
if !ok {
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES environment variable")
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES or GITHUB_TOKEN environment variable")
os.Exit(1)
}
gh := github.NewClient(githubToken)
Expand Down
11 changes: 9 additions & 2 deletions .ci/magician/cmd/test_terraform_vcr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import (
)

var ttvEnvironmentVariables = [...]string{
"GITHUB_TOKEN_DOWNSTREAMS",
"GITHUB_TOKEN_MAGIC_MODULES",
"GOCACHE",
"GOPATH",
"GOOGLE_BILLING_ACCOUNT",
Expand Down Expand Up @@ -55,6 +53,15 @@ var testTerraformVCRCmd = &cobra.Command{
env[ev] = val
}

for _, tokenName := range []string{"GITHUB_TOKEN_DOWNSTREAMS", "GITHUB_TOKEN_MAGIC_MODULES"} {
val, ok := lookupGithubTokenOrFallback(tokenName)
if !ok {
fmt.Printf("Did not provide %s or GITHUB_TOKEN environment variable\n", tokenName)
os.Exit(1)
}
env[tokenName] = val
trodge marked this conversation as resolved.
Show resolved Hide resolved
}

baseBranch := os.Getenv("BASE_BRANCH")
if baseBranch == "" {
baseBranch = "main"
Expand Down
4 changes: 2 additions & 2 deletions .ci/magician/cmd/test_tgc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ var testTGCCmd = &cobra.Command{
commit := os.Getenv("COMMIT_SHA")
pr := os.Getenv("PR_NUMBER")

githubToken, ok := os.LookupEnv("GITHUB_TOKEN_MAGIC_MODULES")
githubToken, ok := lookupGithubTokenOrFallback("GITHUB_TOKEN_MAGIC_MODULES")
if !ok {
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES environment variable")
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES or GITHUB_TOKEN environment variables")
os.Exit(1)
}
gh := github.NewClient(githubToken)
Expand Down
4 changes: 2 additions & 2 deletions .ci/magician/cmd/test_tpg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ var testTPGCmd = &cobra.Command{
commit := os.Getenv("COMMIT_SHA")
pr := os.Getenv("PR_NUMBER")

githubToken, ok := os.LookupEnv("GITHUB_TOKEN_MAGIC_MODULES")
githubToken, ok := lookupGithubTokenOrFallback("GITHUB_TOKEN_MAGIC_MODULES")
if !ok {
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES environment variable")
fmt.Println("Did not provide GITHUB_TOKEN_MAGIC_MODULES or GITHUB_TOKEN environment variables")
os.Exit(1)
}
gh := github.NewClient(githubToken)
Expand Down
5 changes: 5 additions & 0 deletions .ci/scripts/go-plus/tgc-tester-integration/test_tgc_integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ post_body=$( jq -n \
--arg state "pending" \
'{context: $context, target_url: $target_url, state: $state}')

# Fall back to old github token if new token is unavailable.
if [[ -z $GITHUB_TOKEN_MAGIC_MODULES ]]; then
GITHUB_TOKEN_MAGIC_MODULES=$GITHUB_TOKEN
fi

curl \
-X POST \
-u "$github_username:$GITHUB_TOKEN_MAGIC_MODULES" \
Expand Down
Loading