Merge pull request cli#3832 from cli/env-set-fix

mislav · web-flow · commit 5984cf2a8235 · 2021-06-14T16:17:24.000+02:00
Fix setting environment secrets
diff --git a/pkg/cmd/secret/set/http.go b/pkg/cmd/secret/set/http.go
@@ -55,6 +55,11 @@ func getRepoPubKey(client *api.Client, repo ghrepo.Interface) (*PubKey, error) {
 		ghrepo.FullName(repo)))
 }
 
+func getEnvPubKey(client *api.Client, repo ghrepo.Interface, envName string) (*PubKey, error) {
+	return getPubKey(client, repo.RepoHost(), fmt.Sprintf("repos/%s/environments/%s/secrets/public-key",
+		ghrepo.FullName(repo), envName))
+}
+
 func putSecret(client *api.Client, host, path string, payload SecretPayload) error {
 	payloadBytes, err := json.Marshal(payload)
 	if err != nil {
diff --git a/pkg/cmd/secret/set/set.go b/pkg/cmd/secret/set/set.go
@@ -168,6 +168,8 @@ func setRun(opts *SetOptions) error {
 	var pk *PubKey
 	if orgName != "" {
 		pk, err = getOrgPublicKey(client, host, orgName)
+	} else if envName != "" {
+		pk, err = getEnvPubKey(client, baseRepo, envName)
 	} else {
 		pk, err = getRepoPubKey(client, baseRepo)
 	}
diff --git a/pkg/cmd/secret/set/set_test.go b/pkg/cmd/secret/set/set_test.go
@@ -219,7 +219,7 @@ func Test_setRun_repo(t *testing.T) {
 func Test_setRun_env(t *testing.T) {
 	reg := &httpmock.Registry{}
 
-	reg.Register(httpmock.REST("GET", "repos/owner/repo/actions/secrets/public-key"),
+	reg.Register(httpmock.REST("GET", "repos/owner/repo/environments/development/secrets/public-key"),
 		httpmock.JSONResponse(PubKey{ID: "123", Key: "CDjXqf7AJBXWhMczcy+Fs7JlACEptgceysutztHaFQI="}))
 
 	reg.Register(httpmock.REST("PUT", "repos/owner/repo/environments/development/secrets/cool_secret"), httpmock.StatusStringResponse(201, `{}`))

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,8 @@ func setRun(opts *SetOptions) error {`
`168`	`168`	`var pk *PubKey`
`169`	`169`	`if orgName != "" {`
`170`	`170`	`pk, err = getOrgPublicKey(client, host, orgName)`
	`171`	`+ } else if envName != "" {`
	`172`	`+ pk, err = getEnvPubKey(client, baseRepo, envName)`
`171`	`173`	`} else {`
`172`	`174`	`pk, err = getRepoPubKey(client, baseRepo)`
`173`	`175`	`}`