Adding a new flag to the deploy command and the related new functionality in order to support the collecting of secrets and sending them to the backend#252
Merged
IvanBorislavovDimitrov merged 7 commits intocloudfoundry:masterfrom Feb 20, 2026
Conversation
|
|
||
| var jsonObject map[string]interface{} | ||
|
|
||
| err2 := json.Unmarshal([]byte(envValue), &jsonObject) |
Contributor
There was a problem hiding this comment.
can you reuse err?
Contributor
Author
There was a problem hiding this comment.
I know that reusing the same err is not recommended- I will just change the names and make them more descriptive instead of a plain err2 :)
vkalapov
requested changes
Jan 27, 2026
| Type typeOfValue | ||
| StringContent string | ||
| JSONContent interface{} | ||
| //ObjectContent map[string]interface{} |
Contributor
There was a problem hiding this comment.
Remove this comment if not needed.
| } | ||
| } | ||
|
|
||
| func TestCollectFromEnvWhenDuplciateNames(t *testing.T) { |
commands/deploy_command.go
Outdated
| "encryptionKey": encryptionKey, | ||
| "keyId": keyID, | ||
| } | ||
| jsonBody, _ := json.Marshal(upsCredentials) |
Contributor
There was a problem hiding this comment.
Why is the error from json.Marshal ignored here?
Contributor
Author
There was a problem hiding this comment.
Thanks for the suggestion :)
…lity in order to support the collecting of secrets and sending them to the backend LMCROSSITXSADEPLOY-2301
LMCROSSITXSADEPLOY-2301
LMCROSSITXSADEPLOY-2301
LMCROSSITXSADEPLOY-2301
karrgov
force-pushed
the
passing_secrets_during_deployment_new
branch
from
77d8ac3 to
8922dd2
Compare
commands/deploy_command.go
Outdated
| upsCredentials := map[string]string{ | ||
| "encryptionKey": encryptionKey, | ||
| } | ||
| jsonBody, _ := json.Marshal(upsCredentials) |
Contributor
There was a problem hiding this comment.
handle exception here
LMCROSSITXSADEPLOY-2301
vkalapov
requested changes
Feb 17, 2026
| Guid string `json:"guid"` | ||
| Name string `json:"name"` | ||
| OfferingGuid string `jsonry:"relationships.service_offering.data.guid,omitempty"` | ||
| OfferingGuid string `jsonry:"rela tionships.service_offering.data.guid,omitempty"` |
| t.Setenv(nameOfEnv, valueOfEnv) | ||
| } | ||
|
|
||
| func TestCollectFromEnv(t *testing.T) { |
Contributor
There was a problem hiding this comment.
This test checks too many behaviors (json, cert etc.). Consider splitting the different checks into smaller tests.
| yamlResult, err := BuildSecureExtension(parameters, "test-mta", "") | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("Error while building the secure extension descriotor: %s", err.Error()) |
|
|
||
| getAppProcessStatsUrl := fmt.Sprintf("%s/%sapps/%s/processes/web/stats", apiEndpoint, cfBaseUrl, appGuid) | ||
| body, err := executeRequest(getAppProcessStatsUrl, token, c.isSslDisabled) | ||
| body, err := executeRequest("GET", getAppProcessStatsUrl, token, c.isSslDisabled, nil) |
Contributor
There was a problem hiding this comment.
Use http.MethodGet instead of raw strings.
| var result []T | ||
| for url != "" { | ||
| body, err := executeRequest(url, token, isSslDisabled) | ||
| body, err := executeRequest("GET", url, token, isSslDisabled, nil) |
Contributor
There was a problem hiding this comment.
Use http.MethodGet instead of raw strings.
| var result []T | ||
| for url != "" { | ||
| body, err := executeRequest(url, token, isSslDisabled) | ||
| body, err := executeRequest("GET", url, token, isSslDisabled, nil) |
Contributor
There was a problem hiding this comment.
Use http.MethodGet instead of raw strings.
commands/deploy_command.go
Outdated
| return "__mta-secure-" + mtaId + "-" + namespace + "-" + resultSuffix, nil | ||
| } | ||
|
|
||
| func setUpSpecificsForDeploymentUsingSecrerts(flags *flag.FlagSet, c *DeployCommand, mtaId, namespace, schemaVersion string, disposableUserProvidedServiceName *string, yamlBytes *[]byte) ExecutionStatus { |
LMCROSSITXSADEPLOY-2301
LMCROSSITXSADEPLOY-2301
vkalapov
approved these changes
Feb 19, 2026
IvanBorislavovDimitrov
approved these changes
Feb 19, 2026
IvanBorislavovDimitrov
merged commit 4e8cfb1
into
cloudfoundry:master
5 of 6 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
LMCROSSITXSADEPLOY-2301