Skip to content

Commit 497ea6b

Browse files
authored
Switch labeler to use go-github (#12701)
1 parent 93298a0 commit 497ea6b

File tree

10 files changed

+289
-196
lines changed

10 files changed

+289
-196
lines changed

.ci/magician/go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ require (
2222
)
2323

2424
require (
25-
cloud.google.com/go/compute v1.19.1 // indirect
26-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
25+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
2726
github.com/davecgh/go-spew v1.1.1 // indirect
2827
github.com/golang/glog v1.1.1 // indirect
2928
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -36,7 +35,7 @@ require (
3635
github.com/pmezard/go-difflib v1.0.0 // indirect
3736
go.opencensus.io v0.24.0 // indirect
3837
golang.org/x/net v0.23.0 // indirect
39-
golang.org/x/oauth2 v0.7.0 // indirect
38+
golang.org/x/oauth2 v0.24.0 // indirect
4039
golang.org/x/sys v0.18.0 // indirect
4140
golang.org/x/text v0.14.0 // indirect
4241
google.golang.org/appengine v1.6.7 // indirect

.ci/magician/go.sum

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
22
cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
3-
cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY=
4-
cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE=
5-
cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
6-
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
3+
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
4+
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
75
cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
86
cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
97
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -109,8 +107,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY
109107
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
110108
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
111109
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
112-
golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
113-
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
110+
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
111+
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
114112
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
115113
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
116114
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

.github/workflows/scorecard.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ permissions: read-all
1919

2020
jobs:
2121
analysis:
22+
if: github.repository == 'GoogleCloudPlatform/magic-modules'
2223
name: Scorecard analysis
2324
runs-on: ubuntu-22.04
2425
permissions:

.github/workflows/teamcity-services-diff-check-weekly.yml

+35-34
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,39 @@ on:
1212

1313
jobs:
1414
teamcity-services-diff-check:
15-
env:
16-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17-
runs-on: ubuntu-22.04
18-
steps:
19-
- name: Checkout Repository
20-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2
21-
- name: TeamCity Google Provider Generate
22-
uses: ./.github/actions/build-downstream
23-
with:
24-
repo: 'terraform-provider-google'
25-
token: '$GITHUB_TOKEN'
26-
# The path where GA/Beta providers are generated is grabbed from the OUTPUT_PATH that's set in build_downstream.yaml
27-
# export OUTPUT_PATH=$GOPATH/src/github.com/$UPSTREAM_OWNER/$GH_REPO
28-
# OUTPUT_PATH changes after each generate (GA/beta)
29-
- name: Set GOOGLE_REPO_PATH to path where GA provider was generated
30-
run: echo "GOOGLE_REPO_PATH=${{ env.OUTPUT_PATH}}" >> $GITHUB_ENV
31-
- name: TeamCity Google Beta Provider Generate
32-
uses: ./.github/actions/build-downstream
33-
with:
34-
repo: 'terraform-provider-google-beta'
35-
token: '$GITHUB_TOKEN'
36-
- name: Set GOOGLE_BETA_REPO_PATH to path where beta provider was generated
37-
run: echo "GOOGLE_BETA_REPO_PATH=${{ env.OUTPUT_PATH}}" >> $GITHUB_ENV
38-
- name: Check that new services have been added to the TeamCity configuration code
39-
run: |
40-
# Create lists of service packages in providers. Need to cd into repos where go.mod is to do this command.
41-
cd ${{env.GOOGLE_REPO_PATH}}
42-
go list -f '{{.Name}}' ${{env.GOOGLE_REPO_PATH}}/google/services/... > $GITHUB_WORKSPACE/provider_services_ga.txt
43-
cd ${{env.GOOGLE_BETA_REPO_PATH}}
44-
go list -f '{{.Name}}' ${{env.GOOGLE_BETA_REPO_PATH}}/google-beta/services/... > $GITHUB_WORKSPACE/provider_services_beta.txt
15+
if: github.repository == 'GoogleCloudPlatform/magic-modules'
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
runs-on: ubuntu-22.04
19+
steps:
20+
- name: Checkout Repository
21+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2
22+
- name: TeamCity Google Provider Generate
23+
uses: ./.github/actions/build-downstream
24+
with:
25+
repo: 'terraform-provider-google'
26+
token: '$GITHUB_TOKEN'
27+
# The path where GA/Beta providers are generated is grabbed from the OUTPUT_PATH that's set in build_downstream.yaml
28+
# export OUTPUT_PATH=$GOPATH/src/github.com/$UPSTREAM_OWNER/$GH_REPO
29+
# OUTPUT_PATH changes after each generate (GA/beta)
30+
- name: Set GOOGLE_REPO_PATH to path where GA provider was generated
31+
run: echo "GOOGLE_REPO_PATH=${{ env.OUTPUT_PATH}}" >> $GITHUB_ENV
32+
- name: TeamCity Google Beta Provider Generate
33+
uses: ./.github/actions/build-downstream
34+
with:
35+
repo: 'terraform-provider-google-beta'
36+
token: '$GITHUB_TOKEN'
37+
- name: Set GOOGLE_BETA_REPO_PATH to path where beta provider was generated
38+
run: echo "GOOGLE_BETA_REPO_PATH=${{ env.OUTPUT_PATH}}" >> $GITHUB_ENV
39+
- name: Check that new services have been added to the TeamCity configuration code
40+
run: |
41+
# Create lists of service packages in providers. Need to cd into repos where go.mod is to do this command.
42+
cd ${{env.GOOGLE_REPO_PATH}}
43+
go list -f '{{.Name}}' ${{env.GOOGLE_REPO_PATH}}/google/services/... > $GITHUB_WORKSPACE/provider_services_ga.txt
44+
cd ${{env.GOOGLE_BETA_REPO_PATH}}
45+
go list -f '{{.Name}}' ${{env.GOOGLE_BETA_REPO_PATH}}/google-beta/services/... > $GITHUB_WORKSPACE/provider_services_beta.txt
4546
46-
# Run tool to compare service packages in the providers vs those listed in TeamCity config files
47-
cd $GITHUB_WORKSPACE
48-
go run ./tools/teamcity-diff-check/main.go -version=ga -provider_services=./provider_services_ga.txt -teamcity_services=./mmv1/third_party/terraform/.teamcity/components/inputs/services_ga.kt
49-
go run ./tools/teamcity-diff-check/main.go -version=beta -provider_services=./provider_services_beta.txt -teamcity_services=./mmv1/third_party/terraform/.teamcity/components/inputs/services_beta.kt
47+
# Run tool to compare service packages in the providers vs those listed in TeamCity config files
48+
cd $GITHUB_WORKSPACE
49+
go run ./tools/teamcity-diff-check/main.go -version=ga -provider_services=./provider_services_ga.txt -teamcity_services=./mmv1/third_party/terraform/.teamcity/components/inputs/services_ga.kt
50+
go run ./tools/teamcity-diff-check/main.go -version=beta -provider_services=./provider_services_beta.txt -teamcity_services=./mmv1/third_party/terraform/.teamcity/components/inputs/services_beta.kt
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package constants
2+
3+
const GITHUB_YELLOW = "fbca04"

tools/issue-labeler/go.mod

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ go 1.23
44

55
require (
66
github.com/golang/glog v1.1.1
7+
github.com/google/go-github/v61 v61.0.0
8+
github.com/spf13/cobra v1.8.1
79
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad
10+
golang.org/x/oauth2 v0.24.0
811
gopkg.in/yaml.v2 v2.4.0
912
)
1013

1114
require (
15+
github.com/google/go-querystring v1.1.0 // indirect
1216
github.com/inconshreveable/mousetrap v1.1.0 // indirect
13-
github.com/spf13/cobra v1.8.1 // indirect
1417
github.com/spf13/pflag v1.0.5 // indirect
1518
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
1619
)

tools/issue-labeler/go.sum

+10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
22
github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw=
33
github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
4+
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
5+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
6+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
7+
github.com/google/go-github/v61 v61.0.0 h1:VwQCBwhyE9JclCI+22/7mLB1PuU9eowCXKY5pNlu1go=
8+
github.com/google/go-github/v61 v61.0.0/go.mod h1:0WR+KmsWX75G2EbpyGsGmradjo3IiciuI4BmdVCobQY=
9+
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
10+
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
411
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
512
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
613
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
@@ -15,6 +22,9 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
1522
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
1623
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad h1:g0bG7Z4uG+OgH2QDODnjp6ggkk1bJDsINcuWmJN1iJU=
1724
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
25+
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
26+
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
27+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1828
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1929
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
2030
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

0 commit comments

Comments
 (0)