Skip to content

Commit

Permalink
revert default value change
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael Beemer <michael.beemer@dynatrace.com>
  • Loading branch information
@beeme1mr
beeme1mr committed Jan 23, 2025
1 parent cdce221 commit 12cd2cb
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 43 deletions.
10 changes: 5 additions & 5 deletions cmd/generate/testdata/success_manifest.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
"flags": {
"enableFeatureA": {
"flagType": "boolean",
"codeDefault": false,
"defaultValue": false,
"description": "Controls whether Feature A is enabled."
},
"usernameMaxLength": {
"flagType": "integer",
"codeDefault": 50,
"defaultValue": 50,
"description": "Maximum allowed length for usernames."
},
"greetingMessage": {
"flagType": "string",
"codeDefault": "Hello there!",
"defaultValue": "Hello there!",
"description": "The message to use for greeting users."
},
"discountPercentage": {
"flagType": "float",
"codeDefault": 0.15,
"defaultValue": 0.15,
"description": "Discount percentage applied to purchases."
},
"themeCustomization": {
"flagType": "object",
"codeDefault": {
"defaultValue": {
"primaryColor": "#007bff",
"secondaryColor": "#6c757d"
},
Expand Down
14 changes: 7 additions & 7 deletions internal/generate/manifestutils/manifestutils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ var stringToFlagType = map[string]types.FlagType{
"object": types.ObjectType,
}

func getCodeDefault(codeDefault interface{}, flagType types.FlagType) string {
func getDefaultValue(defaultValue interface{}, flagType types.FlagType) string {
switch flagType {
case types.BoolType:
return strconv.FormatBool(codeDefault.(bool))
return strconv.FormatBool(defaultValue.(bool))
case types.IntType:
//the conversion to float64 instead of integer typically occurs
//due to how JSON is parsed in Go. In Go's encoding/json package,
//all JSON numbers are unmarshaled into float64 by default when decoding into an interface{}.
return strconv.FormatFloat(codeDefault.(float64), 'g', -1, 64)
return strconv.FormatFloat(defaultValue.(float64), 'g', -1, 64)
case types.FloatType:
return strconv.FormatFloat(codeDefault.(float64), 'g', -1, 64)
return strconv.FormatFloat(defaultValue.(float64), 'g', -1, 64)
case types.StringType:
return codeDefault.(string)
return defaultValue.(string)
default:
return ""
}
Expand Down Expand Up @@ -97,11 +97,11 @@ func unmarshalFlagManifest(data []byte) (*types.BaseTmplData, error) {
flagTypeString := flagData["flagType"].(string)
flagType := stringToFlagType[flagTypeString]
docs := flagData["description"].(string)
codeDefault := getCodeDefault(flagData["codeDefault"], flagType)
defaultValue := getDefaultValue(flagData["defaultValue"], flagType)
btData.Flags = append(btData.Flags, &types.FlagTmplData{
Name: flagKey,
Type: flagType,
CodeDefault: codeDefault,
DefaultValue: defaultValue,
Docs: docs,
})
}
Expand Down
8 changes: 4 additions & 4 deletions internal/generate/plugins/golang/golang.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ func supportImports(flags []*types.FlagTmplData) []string {
return res
}

func codeDefaultValueLiteral(flag *types.FlagTmplData) string {
func defaultValueLiteral(flag *types.FlagTmplData) string {
switch flag.Type {
case types.StringType:
return strconv.Quote(flag.CodeDefault)
return strconv.Quote(flag.DefaultValue)
default:
return flag.CodeDefault
return flag.DefaultValue
}
}

Expand Down Expand Up @@ -111,7 +111,7 @@ func (g *genImpl) Generate(input types.Input) error {
"FlagInitParam": flagInitParam,
"OpenFeatureType": openFeatureType,
"SupportImports": supportImports,
"CodeDefaultValueLiteral": codeDefaultValueLiteral,
"DefaultValueLiteral": defaultValueLiteral,
"TypeString": typeString,
}
td := TmplData{
Expand Down
4 changes: 2 additions & 2 deletions internal/generate/plugins/golang/golang.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ var {{FlagVarName .Name}} = struct {
ValueWithDetails {{OpenFeatureType .Type}}ProviderDetails
}{
Value: func(ctx context.Context, evalCtx openfeature.EvaluationContext) ({{TypeString .Type}}, error) {
return client.{{OpenFeatureType .Type}}Value(ctx, {{FlagInitParam .Name}}, {{CodeDefaultValueLiteral .}}, evalCtx)
return client.{{OpenFeatureType .Type}}Value(ctx, {{FlagInitParam .Name}}, {{DefaultValueLiteral .}}, evalCtx)
},
ValueWithDetails: func(ctx context.Context, evalCtx openfeature.EvaluationContext) (openfeature.{{OpenFeatureType .Type}}EvaluationDetails, error){
return client.{{OpenFeatureType .Type}}ValueDetails(ctx, {{FlagInitParam .Name}}, {{CodeDefaultValueLiteral .}}, evalCtx)
return client.{{OpenFeatureType .Type}}ValueDetails(ctx, {{FlagInitParam .Name}}, {{DefaultValueLiteral .}}, evalCtx)
},
}
{{- end}}
Expand Down
8 changes: 4 additions & 4 deletions internal/generate/plugins/react/react.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ func supportImports(flags []*types.FlagTmplData) []string {
return result
}

func codeDefaultValueLiteral(flag *types.FlagTmplData) string {
func defaultValueLiteral(flag *types.FlagTmplData) string {
switch flag.Type {
case types.StringType:
return strconv.Quote(flag.CodeDefault)
return strconv.Quote(flag.DefaultValue)
default:
return flag.CodeDefault
return flag.DefaultValue
}
}

Expand All @@ -93,7 +93,7 @@ func (g *genImpl) Generate(input types.Input) error {
"FlagInitParam": flagInitParam,
"FlagAccessFunc": flagAccessFunc,
"SupportImports": supportImports,
"CodeDefaultValueLiteral": codeDefaultValueLiteral,
"DefaultValueLiteral": defaultValueLiteral,
"TypeString": typeString,
}
td := TmplData{
Expand Down
8 changes: 4 additions & 4 deletions internal/generate/plugins/react/react.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ import {
*
* **Details:**
* - flag key: `{{ .Name}}`
* - default value: `{{ .CodeDefault }}`
* - default value: `{{ .DefaultValue }}`
* - type: `{{TypeString .Type}}`
*/
export const use{{FlagVarName .Name}} = (options: ReactFlagEvaluationOptions) => {
return useFlag({{FlagInitParam .Name}}, {{CodeDefaultValueLiteral .}}, options);
return useFlag({{FlagInitParam .Name}}, {{DefaultValueLiteral .}}, options);
};

/**
* {{.Docs}}
*
* **Details:**
* - flag key: `{{ .Name}}`
* - default value: `{{ .CodeDefault }}`
* - default value: `{{ .DefaultValue }}`
* - type: `{{TypeString .Type}}`
*
* Equivalent to useFlag with options: `{ suspend: true }`
* @experimental — Suspense is an experimental feature subject to change in future versions.
*/
export const useSuspense{{FlagVarName .Name}} = (options: ReactFlagEvaluationNoSuspenseOptions) => {
return useSuspenseFlag({{FlagInitParam .Name}}, {{CodeDefaultValueLiteral .}}, options);
return useSuspenseFlag({{FlagInitParam .Name}}, {{DefaultValueLiteral .}}, options);
};
{{ end}}
2 changes: 1 addition & 1 deletion internal/generate/types/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const (
type FlagTmplData struct {
Name string
Type FlagType
CodeDefault string
DefaultValue string
Docs string
}

Expand Down
10 changes: 5 additions & 5 deletions sample/sample_manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
"flags": {
"enableFeatureA": {
"flagType": "boolean",
"codeDefault": false,
"defaultValue": false,
"description": "Controls whether Feature A is enabled."
},
"usernameMaxLength": {
"flagType": "integer",
"codeDefault": 50,
"defaultValue": 50,
"description": "Maximum allowed length for usernames."
},
"greetingMessage": {
"flagType": "string",
"codeDefault": "Hello there!",
"defaultValue": "Hello there!",
"description": "The message to use for greeting users."
},
"discountPercentage": {
"flagType": "float",
"codeDefault": 0.15,
"defaultValue": 0.15,
"description": "Discount percentage applied to purchases."
},
"themeCustomization": {
"flagType": "object",
"codeDefault": {
"defaultValue": {
"primaryColor": "#007bff",
"secondaryColor": "#6c757d"
},
Expand Down
12 changes: 6 additions & 6 deletions schema/v0/flag_manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
],
"required": [
"flagType",
"codeDefault"
"defaultValue"
]
},
"booleanType": {
Expand All @@ -54,7 +54,7 @@
"boolean"
]
},
"codeDefault": {
"defaultValue": {
"description": "The default value returned in code if a flag evaluation is unsuccessful",
"type": "boolean"
},
Expand All @@ -72,7 +72,7 @@
"string"
]
},
"codeDefault": {
"defaultValue": {
"type": "string"
},
"description": {
Expand All @@ -89,7 +89,7 @@
"integer"
]
},
"codeDefault": {
"defaultValue": {
"type": "integer"
},
"description": {
Expand All @@ -106,7 +106,7 @@
"float"
]
},
"codeDefault": {
"defaultValue": {
"type": "number"
},
"description": {
Expand All @@ -123,7 +123,7 @@
"object"
]
},
"codeDefault": {
"defaultValue": {
"type": "object"
},
"description": {
Expand Down
10 changes: 5 additions & 5 deletions schema/v0/tests/positive/min-flag-manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
"flags": {
"booleanFlag": {
"flagType": "boolean",
"codeDefault": true
"defaultValue": true
},
"stringFlag": {
"flagType": "string",
"codeDefault": "default"
"defaultValue": "default"
},
"integerFlag": {
"flagType": "integer",
"codeDefault": 50
"defaultValue": 50
},
"floatFlag": {
"flagType": "float",
"codeDefault": 0.15
"defaultValue": 0.15
},
"objectFlag": {
"flagType": "object",
"codeDefault": {
"defaultValue": {
"primaryColor": "#007bff",
"secondaryColor": "#6c757d"
}
Expand Down

0 comments on commit 12cd2cb

Please sign in to comment.