From 7f3e634e19cbb3d8b1e64ce971d028cf2509870a Mon Sep 17 00:00:00 2001 From: Danny Olson Date: Fri, 19 Apr 2024 13:26:03 -0700 Subject: [PATCH 1/2] Don't find/replace FLAG_KEY in SDK instructions This was breaking java and android examples. --- internal/sdks/sdks.go | 2 -- internal/sdks/sdks_test.go | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/internal/sdks/sdks.go b/internal/sdks/sdks.go index ea503743..f4dcb685 100644 --- a/internal/sdks/sdks.go +++ b/internal/sdks/sdks.go @@ -22,8 +22,6 @@ func ReplaceFlagKey(instructions string, key string) string { key, "my-boolean-flag", key, - "FLAG_KEY", - key, "", key, ) diff --git a/internal/sdks/sdks_test.go b/internal/sdks/sdks_test.go index 94a98725..03d837e7 100644 --- a/internal/sdks/sdks_test.go +++ b/internal/sdks/sdks_test.go @@ -25,18 +25,18 @@ func TestReplaceFlagKey(t *testing.T) { body: "# title ```const featureFlagKey = \"my-boolean-flag\"```", expected: "# title ```const featureFlagKey = \"real-flag-key\"```", }, - "replaces placeholder FLAG_KEY": { - body: "# title ```const featureFlagKey = \"my-boolean-flag\"```", - expected: "# title ```const featureFlagKey = \"real-flag-key\"```", - }, "replaces placeholder ": { - body: "# title ```hello_erlang_server:get(<<\"FLAG_KEY\">>)```", + body: "# title ```hello_erlang_server:get(<<\"my-flag-key\">>)```", expected: "# title ```hello_erlang_server:get(<<\"real-flag-key\">>)```", }, "replaces camelCase ": { body: "# title ```const featureFlagKey = \"myFlagKey\"```", expected: "# title ```const featureFlagKey = \"realFlagKey\"```", }, + "does not replace BOOLEAN_FLAG_KEY": { + body: "# title ```val BOOLEAN_FLAG_KEY = \"myFlagKey\"```", + expected: "# title ```val BOOLEAN_FLAG_KEY = \"realFlagKey\"```", + }, } for name, tt := range tests { tt := tt From 04d5b5b431a5a7ad85346be1dcf6fc3aa97338ea Mon Sep 17 00:00:00 2001 From: Danny Olson Date: Mon, 22 Apr 2024 08:18:26 -0700 Subject: [PATCH 2/2] Remove unused placeholders --- internal/sdks/sdks.go | 7 ------- internal/sdks/sdks_test.go | 12 ------------ 2 files changed, 19 deletions(-) diff --git a/internal/sdks/sdks.go b/internal/sdks/sdks.go index f4dcb685..289432c0 100644 --- a/internal/sdks/sdks.go +++ b/internal/sdks/sdks.go @@ -17,13 +17,6 @@ func ReplaceFlagKey(instructions string, key string) string { key, "myFlagKey", kebabToCamel(key), - // remove remaining keys when we add all hardcoded instructions - "my-flag", - key, - "my-boolean-flag", - key, - "", - key, ) return r.Replace(instructions) diff --git a/internal/sdks/sdks_test.go b/internal/sdks/sdks_test.go index 03d837e7..1f3a9421 100644 --- a/internal/sdks/sdks_test.go +++ b/internal/sdks/sdks_test.go @@ -17,18 +17,6 @@ func TestReplaceFlagKey(t *testing.T) { body: "# title ```const featureFlagKey = \"my-flag-key\"```", expected: "# title ```const featureFlagKey = \"real-flag-key\"```", }, - "replaces placeholder my-flag": { - body: "# title ```const featureFlagKey = \"my-flag\"```", - expected: "# title ```const featureFlagKey = \"real-flag-key\"```", - }, - "replaces placeholder my-boolean-flag": { - body: "# title ```const featureFlagKey = \"my-boolean-flag\"```", - expected: "# title ```const featureFlagKey = \"real-flag-key\"```", - }, - "replaces placeholder ": { - body: "# title ```hello_erlang_server:get(<<\"my-flag-key\">>)```", - expected: "# title ```hello_erlang_server:get(<<\"real-flag-key\">>)```", - }, "replaces camelCase ": { body: "# title ```const featureFlagKey = \"myFlagKey\"```", expected: "# title ```const featureFlagKey = \"realFlagKey\"```",