From 6a8267d1ed886a2ff064947438ff254155c293cc Mon Sep 17 00:00:00 2001 From: MENNY ABOUSH Date: Tue, 23 Jun 2026 15:49:01 +0300 Subject: [PATCH] OSAC-1550: rename sshKey to sshPublicKey in AAP template parameters Align the AAP template parameter key with the proto field rename from ssh_key to ssh_public_key completed in PR #738. Assisted-by: Claude Code Signed-off-by: MENNY ABOUSH --- .../baremetalinstance_reconciler_function.go | 2 +- .../baremetalinstance_reconciler_function_test.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/controllers/baremetalinstance/baremetalinstance_reconciler_function.go b/internal/controllers/baremetalinstance/baremetalinstance_reconciler_function.go index 18766bdaa..3341b5932 100644 --- a/internal/controllers/baremetalinstance/baremetalinstance_reconciler_function.go +++ b/internal/controllers/baremetalinstance/baremetalinstance_reconciler_function.go @@ -508,7 +508,7 @@ func (t *task) mutateBMI(ctx context.Context, object *bmfov1alpha1.BareMetalInst params := map[string]string{} if t.bareMetalInstance.GetSpec().HasSshPublicKey() { - params["sshKey"] = t.bareMetalInstance.GetSpec().GetSshPublicKey() + params["sshPublicKey"] = t.bareMetalInstance.GetSpec().GetSshPublicKey() } if t.userDataSecretName != "" { params["userDataSecret"] = t.userDataSecretName diff --git a/internal/controllers/baremetalinstance/baremetalinstance_reconciler_function_test.go b/internal/controllers/baremetalinstance/baremetalinstance_reconciler_function_test.go index 822d06f2a..46fdf7527 100644 --- a/internal/controllers/baremetalinstance/baremetalinstance_reconciler_function_test.go +++ b/internal/controllers/baremetalinstance/baremetalinstance_reconciler_function_test.go @@ -197,7 +197,7 @@ var _ = Describe("mutateBMI", func() { Expect(obj.Spec.RunStrategy).To(Equal(bmfov1alpha1.RunStrategyUnspecified)) }) - It("should include sshKey and userDataSecret in templateParameters", func() { + It("should include sshPublicKey and userDataSecret in templateParameters", func() { catalogItemsClient := defaultFakeCatalogItemsClient() t := &task{ @@ -221,13 +221,13 @@ var _ = Describe("mutateBMI", func() { var params map[string]string Expect(json.Unmarshal([]byte(obj.Spec.TemplateParameters), ¶ms)).To(Succeed()) - Expect(params["sshKey"]).To(Equal("ssh-ed25519 AAAA... test@example.com")) + Expect(params["sshPublicKey"]).To(Equal("ssh-ed25519 AAAA... test@example.com")) Expect(params["userDataSecret"]).To(Equal("bmi-test-user-data")) }) - It("should include only sshKey when no user data", func() { + It("should include only sshPublicKey when no user data", func() { catalogItemsClient := defaultFakeCatalogItemsClient() - sshKey := "ssh-ed25519 AAAA... test@example.com" + sshPublicKey := "ssh-ed25519 AAAA... test@example.com" t := &task{ r: &function{ @@ -238,7 +238,7 @@ var _ = Describe("mutateBMI", func() { Id: "bmi-test", Spec: privatev1.BareMetalInstanceSpec_builder{ CatalogItem: "catalog-1", - SshPublicKey: new(sshKey), + SshPublicKey: new(sshPublicKey), }.Build(), }.Build(), } @@ -249,8 +249,8 @@ var _ = Describe("mutateBMI", func() { var params map[string]string Expect(json.Unmarshal([]byte(obj.Spec.TemplateParameters), ¶ms)).To(Succeed()) - Expect(params).To(HaveKey("sshKey")) - Expect(params["sshKey"]).To(Equal(sshKey)) + Expect(params).To(HaveKey("sshPublicKey")) + Expect(params["sshPublicKey"]).To(Equal(sshPublicKey)) Expect(params).ToNot(HaveKey("userDataSecret")) })