fix(deps): update k8s.io/test-infra digest to de927c5 (#1068)

ti-community-infra · Dec 5, 2022 · 6577603 · 6577603
1 parent 85302db
commit 6577603
Show file tree

Hide file tree

Showing 24 changed files with 695 additions and 1,479 deletions.
diff --git a/cmd/rerere/main.go b/cmd/rerere/main.go
@@ -32,11 +32,12 @@ const (
 
 type options struct {
 	dryRun bool
+	github prowflagutil.GitHubOptions
 	labels prowflagutil.Strings
 
-	github    prowflagutil.GitHubOptions
-	git       prowflagutil.GitOptions
-	retesting rerere.RetestingOptions
+	webhookSecretFile string
+	git               prowflagutil.GitOptions
+	retesting         rerere.RetestingOptions
 }
 
 // validate validates options.
@@ -83,17 +84,15 @@ func main() {
 		log.WithError(err).Fatal("Error unmarshal job spec.")
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		log.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		log.WithError(err).Fatal("Error getting GitHub client.")
 	}
-
-	gitClient, err := o.git.GitClient(githubClient, secretAgent.GetTokenGenerator(o.github.TokenPath), nil, o.dryRun)
+	gitClient, err := o.github.GitClientFactory("", nil, o.dryRun)
 	if err != nil {
 		log.WithError(err).Fatal("Error getting Git client.")
 	}

diff --git a/cmd/ticommunityautoresponder/main.go b/cmd/ticommunityautoresponder/main.go
@@ -74,12 +74,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -88,7 +87,7 @@ func main() {
 	_ = githubClient.Throttle(360, 360)
 
 	server := &server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		gc:             githubClient,
 		configAgent:    epa,
 		log:            log,

diff --git a/cmd/ticommunityblunderbuss/main.go b/cmd/ticommunityblunderbuss/main.go
@@ -76,12 +76,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -98,7 +97,7 @@ func main() {
 	ol := &ownersclient.OwnersClient{Client: client}
 
 	server := &server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		gc:             githubClient,
 		ol:             ol,
 		configAgent:    epa,

diff --git a/cmd/ticommunitycherrypicker/main.go b/cmd/ticommunitycherrypicker/main.go
@@ -14,7 +14,6 @@ import (
 	"k8s.io/test-infra/pkg/flagutil"
 	"k8s.io/test-infra/prow/config/secret"
 	prowflagutil "k8s.io/test-infra/prow/flagutil"
-	git "k8s.io/test-infra/prow/git/v2"
 	"k8s.io/test-infra/prow/interrupts"
 	"k8s.io/test-infra/prow/pjutil"
 	"k8s.io/test-infra/prow/pluginhelp/externalplugins"
@@ -72,20 +71,19 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
 	// NOTICE: This error is only possible when using the GitHub APP,
 	// but if we use the APP auth later we will have to handle the err.
 	_ = githubClient.Throttle(360, 360)
 
-	gitClient, err := o.github.GitClient(secretAgent, o.dryRun)
+	gitClient, err := o.github.GitClientFactory("", nil, o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting Git client.")
 	}
@@ -110,16 +108,14 @@ func main() {
 		log.WithError(err).Fatal("Error listing bot repositories.")
 	}
 
-	tokenGenerator := secretAgent.GetTokenGenerator(o.github.TokenPath)
 	server := &cherrypicker.Server{
-		WebhookSecretGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
-		GitHubTokenGenerator:   tokenGenerator,
+		WebhookSecretGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		BotUser:                botUser,
 		Email:                  email,
 		ConfigAgent:            epa,
 
-		GitClient:    git.ClientFactoryFrom(gitClient),
-		GitHubClient: newExtGithubClient(githubClient, tokenGenerator),
+		GitClient:    gitClient,
+		GitHubClient: newExtGithubClient(githubClient, nil),
 		Log:          log,
 
 		Bare:      &http.Client{},

diff --git a/cmd/ticommunitycontribution/main.go b/cmd/ticommunitycontribution/main.go
@@ -74,12 +74,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -88,7 +87,7 @@ func main() {
 	_ = githubClient.Throttle(360, 360)
 
 	server := &server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		gc:             githubClient,
 		configAgent:    epa,
 		log:            log,

diff --git a/cmd/ticommunityformatchecker/main.go b/cmd/ticommunityformatchecker/main.go
@@ -73,12 +73,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -87,7 +86,7 @@ func main() {
 	_ = githubClient.Throttle(360, 360)
 
 	server := &server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		gc:             githubClient,
 		configAgent:    epa,
 		log:            log,

diff --git a/cmd/ticommunityissuetriage/main.go b/cmd/ticommunityissuetriage/main.go
@@ -72,12 +72,11 @@ func main() {
 	}
 
 	log.Infof("%s %s", o.github.TokenPath, o.webhookSecretFile)
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -86,8 +85,8 @@ func main() {
 	_ = githubClient.Throttle(360, 360)
 
 	server := &issuetriage.Server{
-		WebhookSecretGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
-		GitHubTokenGenerator:   secretAgent.GetTokenGenerator(o.github.TokenPath),
+		WebhookSecretGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
+		GitHubTokenGenerator:   secret.GetTokenGenerator(o.github.TokenPath),
 		GitHubClient:           githubClient,
 		ConfigAgent:            epa,
 	}

diff --git a/cmd/ticommunitylabel/main.go b/cmd/ticommunitylabel/main.go
@@ -74,12 +74,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -88,7 +87,7 @@ func main() {
 	_ = githubClient.Throttle(360, 360)
 
 	server := &server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		gc:             githubClient,
 		configAgent:    epa,
 		log:            log,

diff --git a/cmd/ticommunitylabelblocker/main.go b/cmd/ticommunitylabelblocker/main.go
@@ -76,12 +76,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -90,7 +89,7 @@ func main() {
 	_ = githubClient.Throttle(360, 360)
 
 	server := &server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		gc:             githubClient,
 		configAgent:    epa,
 		log:            log,

diff --git a/cmd/ticommunitylgtm/main.go b/cmd/ticommunitylgtm/main.go
@@ -76,12 +76,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -98,7 +97,7 @@ func main() {
 	ol := &ownersclient.OwnersClient{Client: client}
 
 	server := &server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		gc:             githubClient,
 		ol:             ol,
 		configAgent:    epa,

diff --git a/cmd/ticommunitymerge/main.go b/cmd/ticommunitymerge/main.go
@@ -77,12 +77,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -99,7 +98,7 @@ func main() {
 	ol := &ownersclient.OwnersClient{Client: client}
 
 	server := &server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		gc:             githubClient,
 		ol:             ol,
 		configAgent:    epa,

diff --git a/cmd/ticommunityowners/main.go b/cmd/ticommunityowners/main.go
@@ -72,12 +72,11 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -94,7 +93,7 @@ func main() {
 
 	server := &owners.Server{
 		Client:         client,
-		TokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		TokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		Gc:             githubClient,
 		ConfigAgent:    epa,
 		Log:            log,

diff --git a/cmd/ticommunitytars/main.go b/cmd/ticommunitytars/main.go
@@ -74,12 +74,11 @@ func main() {
 	log := logrus.StandardLogger().WithField("plugin", tars.PluginName)
 
 	pa := &plugins.ConfigAgent{}
-	if err := pa.Start(o.pluginConfig, nil, "", false); err != nil {
+	if err := pa.Start(o.pluginConfig, nil, "", false, false); err != nil {
 		log.WithError(err).Fatalf("Error loading plugin config from %q.", o.pluginConfig)
 	}
 
-	secretAgent := &secret.Agent{}
-	if err := secretAgent.Start([]string{o.github.TokenPath, o.webhookSecretFile}); err != nil {
+	if err := secret.Add(o.webhookSecretFile); err != nil {
 		logrus.WithError(err).Fatal("Error starting secrets agent.")
 	}
 
@@ -88,7 +87,7 @@ func main() {
 		log.WithError(err).Fatalf("Error loading external plugin config from %q.", o.externalPluginsConfig)
 	}
 
-	githubClient, err := o.github.GitHubClient(secretAgent, o.dryRun)
+	githubClient, err := o.github.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("Error getting GitHub client.")
 	}
@@ -97,7 +96,7 @@ func main() {
 	_ = githubClient.Throttle(360, 360)
 
 	server := &Server{
-		tokenGenerator: secretAgent.GetTokenGenerator(o.webhookSecretFile),
+		tokenGenerator: secret.GetTokenGenerator(o.webhookSecretFile),
 		ghc:            githubClient,
 		log:            log,
 		configAgent:    epa,