feat(svc-account-playbook): Fixes aruba tests due to service-account …

…auth changes Closes VC-32061
Venafi · Mar 28, 2024 · 26dbd7c · 26dbd7c
1 parent 81294fe
commit 26dbd7c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/aruba/features/step_definitions/my_steps.rb b/aruba/features/step_definitions/my_steps.rb
@@ -159,13 +159,13 @@
       json_string = extract_json_from_output(@previous_command_output)
       JSON.parse(json_string)
       if property === "application"
-        @application = unescape_text(normalize_json(@previous_command_output, "application")).tr('"', '')
+        @application = unescape_text(normalize_json(json_string, "application")).tr('"', '')
       elsif property === "expires"
-        @expires = unescape_text(normalize_json(@previous_command_output, "expires_ISO8601")).tr('"', '')
+        @expires = unescape_text(normalize_json(json_string, "expires_ISO8601")).tr('"', '')
       elsif property === "scope"
-        @scope = unescape_text(normalize_json(@previous_command_output, "scope")).tr('"', '')
+        @scope = unescape_text(normalize_json(json_string, "scope")).tr('"', '')
       elsif property === "refresh_until"
-        @refresh_until = unescape_text(normalize_json(@previous_command_output, "refresh_until")).tr('"', '')
+        @refresh_until = unescape_text(normalize_json(json_string, "refresh_until")).tr('"', '')
         Integer(@refresh_until)
       else
         fail(ArgumentError.new("Cant determine property type for #{property}"))

diff --git a/cmd/vcert/config.go b/cmd/vcert/config.go
@@ -176,6 +176,8 @@ func buildConfigFirefly(flags *commandFlags) (*vcert.Config, error) {
 		ConnectorType: endpoint.ConnectorTypeFirefly,
 		BaseUrl:       flags.url,
 		Credentials: &endpoint.Authentication{
+			User:         flags.userName,
+			Password:     flags.password,
 			AccessToken:  flags.token,
 			ClientId:     flags.clientId,
 			ClientSecret: flags.clientSecret,

diff --git a/cmd/vcert/envVars.go b/cmd/vcert/envVars.go
@@ -80,12 +80,12 @@ var (
 		{
 			EnvVarName:  vcertClientSecret,
 			Destination: &flags.clientSecret,
-			FlagName:    "--client-id",
+			FlagName:    "--client-secret",
 		},
 		{
 			EnvVarName:  vcertClientID,
 			Destination: &flags.clientId,
-			FlagName:    "--client-secret",
+			FlagName:    "--client-id",
 		},
 		{
 			EnvVarName:  vcertDeviceURL,