From 13ae644400032801f848ae9dedacac5c2a00327e Mon Sep 17 00:00:00 2001 From: DigitalEagle Date: Fri, 2 Dec 2022 21:52:38 -0700 Subject: [PATCH 1/3] moved the update environment to one call made hostkey check off by default unless specified --- broker/update_app_environment.go | 36 ++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/broker/update_app_environment.go b/broker/update_app_environment.go index 5436155..c1c68a2 100755 --- a/broker/update_app_environment.go +++ b/broker/update_app_environment.go @@ -12,16 +12,21 @@ import ( // Updates the app enviornment variables for creating or updating an instance. func (broker *SCSBroker) UpdateAppEnvironment(cfClient *ccv3.Client, app *ccv3.Application, info *ccv3.Info, kind string, instanceId string, jsonparams string, params map[string]string) error { + var hostKeySetSSH bool = false var profiles []string + var envVarToSet ccv3.EnvironmentVariables for key, value := range params { - _, _, err := cfClient.UpdateApplicationEnvironmentVariables(app.GUID, ccv3.EnvironmentVariables{ - key: *types.NewFilteredString(value), - }) + + envVarToSet[key] = *types.NewFilteredString(value) if key == "SPRING_CLOUD_CONFIG_SERVER_GIT_URI" { profiles = append(profiles, "git") } + if key == "SPRING_CLOUD_CONFIG_SERVER_GIT_HOSTKEY" { + hostKeySetSSH = true + } + if key == "SPRING_CLOUD_CONFIG_SERVER_VAULT_HOST" { profiles = append(profiles, "vault") } @@ -34,9 +39,6 @@ func (broker *SCSBroker) UpdateAppEnvironment(cfClient *ccv3.Client, app *ccv3.A profiles = append(profiles, "credhub") } - if err != nil { - return err - } } var profileString strings.Builder @@ -48,13 +50,21 @@ func (broker *SCSBroker) UpdateAppEnvironment(cfClient *ccv3.Client, app *ccv3.A } } - _, _, err := cfClient.UpdateApplicationEnvironmentVariables(app.GUID, ccv3.EnvironmentVariables{ - "SPRING_APPLICATION_JSON": *types.NewFilteredString(jsonparams), - "JWK_SET_URI": *types.NewFilteredString(fmt.Sprintf("%v/token_keys", info.UAA())), - "SKIP_SSL_VALIDATION": *types.NewFilteredString(strconv.FormatBool(broker.Config.CfConfig.SkipSslValidation)), - "REQUIRED_AUDIENCE": *types.NewFilteredString(fmt.Sprintf("%s.%v", kind, instanceId)), - "SPRING_PROFILES_ACTIVE": *types.NewFilteredString(profileString.String()), - }) + envVarToSet["SPRING_CLOUD_CONFIG_SERVER_GIT_IGNORELOCALSSHSETTINGS"] = *types.NewFilteredString("true") + + if !hostKeySetSSH { + envVarToSet["SPRING_CLOUD_CONFIG_SERVER_GIT_STRICTHOSTKEYCHECKING"] = *types.NewFilteredString("false") + } else { + envVarToSet["SPRING_CLOUD_CONFIG_SERVER_GIT_STRICTHOSTKEYCHECKING"] = *types.NewFilteredString("true") + } + + envVarToSet["SPRING_APPLICATION_JSON"] = *types.NewFilteredString(jsonparams) + envVarToSet["JWK_SET_URI"] = *types.NewFilteredString(fmt.Sprintf("%v/token_keys", info.UAA())) + envVarToSet["SKIP_SSL_VALIDATION"] = *types.NewFilteredString(strconv.FormatBool(broker.Config.CfConfig.SkipSslValidation)) + envVarToSet["REQUIRED_AUDIENCE"] = *types.NewFilteredString(fmt.Sprintf("%s.%v", kind, instanceId)) + envVarToSet["SPRING_PROFILES_ACTIVE"] = *types.NewFilteredString(profileString.String()) + + _, _, err := cfClient.UpdateApplicationEnvironmentVariables(app.GUID, envVarToSet) if err != nil { return err } From c13cf9ebe89945cdcceeb62b82ffd993cb22d5e0 Mon Sep 17 00:00:00 2001 From: DigitalEagle Date: Fri, 2 Dec 2022 21:52:47 -0700 Subject: [PATCH 2/3] Updated to version 1.1.0 --- README.md | 1 + VERSION | 1 + 2 files changed, 2 insertions(+) create mode 100644 VERSION diff --git a/README.md b/README.md index f5e0967..468b8df 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ $cf create-service config-server default test-service -c "whatever json configur ## History ## +* v1.1.0 - Added default settings for the hostKey to not be needed by defaut for CloudFoundry instances * v1.0.0 - Full release with support for SR Actuators * v0.0.5 - Services as configurable objects * v0.0.4 - Now with configurable package names diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..1cc5f65 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.1.0 \ No newline at end of file From eebbeffdbfb7e93a067de8985e82638092b2a7cd Mon Sep 17 00:00:00 2001 From: DigitalEagle Date: Wed, 7 Dec 2022 13:00:09 -0700 Subject: [PATCH 3/3] added make variable --- broker/update_app_environment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broker/update_app_environment.go b/broker/update_app_environment.go index c1c68a2..c4df082 100755 --- a/broker/update_app_environment.go +++ b/broker/update_app_environment.go @@ -14,7 +14,7 @@ func (broker *SCSBroker) UpdateAppEnvironment(cfClient *ccv3.Client, app *ccv3.A var hostKeySetSSH bool = false var profiles []string - var envVarToSet ccv3.EnvironmentVariables + envVarToSet := make(ccv3.EnvironmentVariables) for key, value := range params { envVarToSet[key] = *types.NewFilteredString(value)