From 18ce198b608c156ee1e1a6e19f53d9d1b93e3701 Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Mon, 11 Dec 2023 17:16:01 -0500 Subject: [PATCH 1/4] Tweak example FF code --- .../io/harness/springforward/AboutController.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/harness/springforward/AboutController.java b/src/main/java/io/harness/springforward/AboutController.java index 9a66ba0..b57b40f 100644 --- a/src/main/java/io/harness/springforward/AboutController.java +++ b/src/main/java/io/harness/springforward/AboutController.java @@ -19,9 +19,9 @@ public String index() { * the featureFlag */ final Target target = Target.builder() - .identifier("Test") - .name("Test") - .attribute("location", "test env") + .identifier("account1") + .name("Account 1") + .attribute("Region", "EMEA") .build(); Boolean ABOUT_PAGE = null; @@ -32,9 +32,11 @@ public String index() { } if (ABOUT_PAGE) { - return "FF is on!"; + return "ABOUT_PAGE is enabled!"; } else { - return "FF is off!"; + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "entity not found" + ); } } } \ No newline at end of file From 3abb99fb2337cf51a2cd22d81856a8a049ed430e Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Mon, 11 Dec 2023 18:15:03 -0500 Subject: [PATCH 2/4] Import exception --- src/main/java/io/harness/springforward/AboutController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/harness/springforward/AboutController.java b/src/main/java/io/harness/springforward/AboutController.java index b57b40f..565f47e 100644 --- a/src/main/java/io/harness/springforward/AboutController.java +++ b/src/main/java/io/harness/springforward/AboutController.java @@ -2,6 +2,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; import io.harness.cf.client.api.*; import io.harness.cf.client.dto.Target; From 6b6feaac1076cadcbaa9852f3cabef0fb19d8b06 Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Mon, 11 Dec 2023 18:32:01 -0500 Subject: [PATCH 3/4] Import httpstatus --- src/main/java/io/harness/springforward/AboutController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/harness/springforward/AboutController.java b/src/main/java/io/harness/springforward/AboutController.java index 565f47e..1bb07e0 100644 --- a/src/main/java/io/harness/springforward/AboutController.java +++ b/src/main/java/io/harness/springforward/AboutController.java @@ -3,6 +3,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import org.springframework.http.HttpStatus; import io.harness.cf.client.api.*; import io.harness.cf.client.dto.Target; From b37261c0e5de3059ba6799664bd0d2e60a19d1a0 Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Mon, 11 Dec 2023 18:47:48 -0500 Subject: [PATCH 4/4] Fix FF key reference --- helm-chart/values-ff-env-key.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-chart/values-ff-env-key.yaml b/helm-chart/values-ff-env-key.yaml index f22928b..3c71437 100644 --- a/helm-chart/values-ff-env-key.yaml +++ b/helm-chart/values-ff-env-key.yaml @@ -1,4 +1,4 @@ harness: featureFlags: enabled: true - apiKey: "<+secrets.getValue("Spring_Forward_Dev_FF_key")>" + apiKey: "<+env.variables.ff_key_spring_forward>"