Skip to content

Commit cc759d9

Browse files
joshistejoshiste
authored
chore: bump Go to 1.26.2 (#187)
1 parent 227c5c0 commit cc759d9

31 files changed

Lines changed: 383 additions & 395 deletions

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
extension-ci:
2020
uses: steadybit/extension-kit/.github/workflows/reusable-extension-ci.yml@main # NOSONAR githubactions:S7637 - our own action
2121
with:
22-
go_version: '^1.25.9'
22+
go_version: '^1.26.2'
2323
build_linux_packages: true
2424
VERSION_BUMPER_APPID: ${{ vars.GH_APP_STEADYBIT_APP_ID }}
2525
secrets:

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## (next)
4+
5+
- Bump Go to 1.26.2
6+
37
## v1.2.6
48

59
- Bump Go to 1.25.9

‎appconfig/attack.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/steadybit/action-kit/go/action_kit_sdk"
1616
"github.com/steadybit/extension-azure/common"
1717
extension_kit "github.com/steadybit/extension-kit"
18-
"github.com/steadybit/extension-kit/extutil"
1918
)
2019

2120
type AppConfigurationAction struct {
@@ -56,29 +55,29 @@ func (config *FaultInjectionConfig) ToAppConfigKeyValuePairs(suffix string) map[
5655
appConfigMapping := make(map[string]*string)
5756

5857
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", suffix)] = &config.Injection
59-
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", suffix)] = extutil.Ptr(fmt.Sprint(config.Rate))
60-
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", suffix)] = extutil.Ptr(fmt.Sprint(config.Enabled))
58+
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", suffix)] = new(fmt.Sprint(config.Rate))
59+
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", suffix)] = new(fmt.Sprint(config.Enabled))
6160

6261
if config.StatusCode != nil {
63-
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:StatusCode", suffix)] = extutil.Ptr(fmt.Sprint(*config.StatusCode))
62+
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:StatusCode", suffix)] = new(fmt.Sprint(*config.StatusCode))
6463
}
6564

6665
if config.MinLatency != nil {
6766
log.Debug().Msgf("Setting minimum latency to %d ms", config.MinLatency.Milliseconds())
68-
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MinimumLatency", suffix)] = extutil.Ptr(fmt.Sprint(config.MinLatency.Milliseconds()))
67+
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MinimumLatency", suffix)] = new(fmt.Sprint(config.MinLatency.Milliseconds()))
6968
}
7069

7170
if config.MaxLatency != nil {
7271
log.Debug().Msgf("Setting maximum latency to %d ms", config.MaxLatency.Milliseconds())
73-
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MaximumLatency", suffix)] = extutil.Ptr(fmt.Sprint(config.MaxLatency.Milliseconds()))
72+
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MaximumLatency", suffix)] = new(fmt.Sprint(config.MaxLatency.Milliseconds()))
7473
}
7574

7675
if config.ExceptionMsg != nil {
7776
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:Exception:Message", suffix)] = config.ExceptionMsg
7877
}
7978

8079
if config.DiskSpace != nil {
81-
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:FillDisk:Megabytes", suffix)] = extutil.Ptr(fmt.Sprint(*config.DiskSpace))
80+
appConfigMapping[fmt.Sprintf("Steadybit:FaultInjection:%s:FillDisk:Megabytes", suffix)] = new(fmt.Sprint(*config.DiskSpace))
8281
}
8382

8483
return appConfigMapping
@@ -166,8 +165,8 @@ func (a *AppConfigurationAction) Start(ctx context.Context, state *AppConfigurat
166165
return nil, extension_kit.ToError("Failed to create Azure App Configuration client.", err)
167166
}
168167

169-
client.SetSetting(ctx, fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", *state.Config.AppConfigurationSuffix), extutil.Ptr("Yes"), nil)
170-
client.SetSetting(ctx, fmt.Sprintf("Steadybit:FaultInjection:%s:Revision", *state.Config.AppConfigurationSuffix), extutil.Ptr(uuid.New().String()), nil)
168+
client.SetSetting(ctx, fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", *state.Config.AppConfigurationSuffix), new("Yes"), nil)
169+
client.SetSetting(ctx, fmt.Sprintf("Steadybit:FaultInjection:%s:Revision", *state.Config.AppConfigurationSuffix), new(uuid.New().String()), nil)
171170

172171
for key, value := range state.Config.ToAppConfigKeyValuePairs(*state.Config.AppConfigurationSuffix) {
173172
if _, err := client.SetSetting(ctx, key, value, nil); err != nil {
@@ -200,7 +199,7 @@ func (a *AppConfigurationAction) Stop(ctx context.Context, state *AppConfigurati
200199

201200
filter := *state.Config.AppConfigurationSuffix
202201
pager := client.NewListSettingsPager(azappconfig.SettingSelector{
203-
KeyFilter: extutil.Ptr(fmt.Sprintf("Steadybit:FaultInjection:%s:*", filter)),
202+
KeyFilter: new(fmt.Sprintf("Steadybit:FaultInjection:%s:*", filter)),
204203
}, &azappconfig.ListSettingsOptions{})
205204

206205
var keysToDelete []string

‎appconfig/attack_test.go‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ func TestFaultInjectionConfig_ToAppConfigKeyValuePairs(t *testing.T) {
2626
Enabled: true,
2727
},
2828
expected: map[string]*string{
29-
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): extutil.Ptr("exception"),
30-
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): extutil.Ptr("50"),
31-
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): extutil.Ptr("true"),
29+
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): new("exception"),
30+
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): new("50"),
31+
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): new("true"),
3232
},
3333
},
3434
{
@@ -37,13 +37,13 @@ func TestFaultInjectionConfig_ToAppConfigKeyValuePairs(t *testing.T) {
3737
Injection: "status_code",
3838
Rate: 75,
3939
Enabled: true,
40-
StatusCode: extutil.Ptr(500),
40+
StatusCode: new(500),
4141
},
4242
expected: map[string]*string{
43-
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): extutil.Ptr("status_code"),
44-
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): extutil.Ptr("75"),
45-
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): extutil.Ptr("true"),
46-
fmt.Sprintf("Steadybit:FaultInjection:%s:StatusCode", targetName): extutil.Ptr("500"),
43+
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): new("status_code"),
44+
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): new("75"),
45+
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): new("true"),
46+
fmt.Sprintf("Steadybit:FaultInjection:%s:StatusCode", targetName): new("500"),
4747
},
4848
},
4949
{
@@ -56,11 +56,11 @@ func TestFaultInjectionConfig_ToAppConfigKeyValuePairs(t *testing.T) {
5656
MaxLatency: extutil.Ptr(500 * time.Millisecond),
5757
},
5858
expected: map[string]*string{
59-
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): extutil.Ptr("latency"),
60-
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): extutil.Ptr("100"),
61-
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): extutil.Ptr("true"),
62-
fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MinimumLatency", targetName): extutil.Ptr("100"),
63-
fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MaximumLatency", targetName): extutil.Ptr("500"),
59+
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): new("latency"),
60+
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): new("100"),
61+
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): new("true"),
62+
fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MinimumLatency", targetName): new("100"),
63+
fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MaximumLatency", targetName): new("500"),
6464
},
6565
},
6666
{
@@ -69,13 +69,13 @@ func TestFaultInjectionConfig_ToAppConfigKeyValuePairs(t *testing.T) {
6969
Injection: "exception",
7070
Rate: 25,
7171
Enabled: true,
72-
ExceptionMsg: extutil.Ptr("Test exception message"),
72+
ExceptionMsg: new("Test exception message"),
7373
},
7474
expected: map[string]*string{
75-
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): extutil.Ptr("exception"),
76-
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): extutil.Ptr("25"),
77-
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): extutil.Ptr("true"),
78-
fmt.Sprintf("Steadybit:FaultInjection:%s:Exception:Message", targetName): extutil.Ptr("Test exception message"),
75+
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): new("exception"),
76+
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): new("25"),
77+
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): new("true"),
78+
fmt.Sprintf("Steadybit:FaultInjection:%s:Exception:Message", targetName): new("Test exception message"),
7979
},
8080
},
8181
{
@@ -84,13 +84,13 @@ func TestFaultInjectionConfig_ToAppConfigKeyValuePairs(t *testing.T) {
8484
Injection: "fill_disk",
8585
Rate: 90,
8686
Enabled: true,
87-
DiskSpace: extutil.Ptr(1024),
87+
DiskSpace: new(1024),
8888
},
8989
expected: map[string]*string{
90-
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): extutil.Ptr("fill_disk"),
91-
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): extutil.Ptr("90"),
92-
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): extutil.Ptr("true"),
93-
fmt.Sprintf("Steadybit:FaultInjection:%s:FillDisk:Megabytes", targetName): extutil.Ptr("1024"),
90+
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): new("fill_disk"),
91+
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): new("90"),
92+
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): new("true"),
93+
fmt.Sprintf("Steadybit:FaultInjection:%s:FillDisk:Megabytes", targetName): new("1024"),
9494
},
9595
},
9696
{
@@ -99,21 +99,21 @@ func TestFaultInjectionConfig_ToAppConfigKeyValuePairs(t *testing.T) {
9999
Injection: "mixed",
100100
Rate: 60,
101101
Enabled: false,
102-
StatusCode: extutil.Ptr(404),
102+
StatusCode: new(404),
103103
MinLatency: extutil.Ptr(200 * time.Millisecond),
104104
MaxLatency: extutil.Ptr(800 * time.Millisecond),
105-
ExceptionMsg: extutil.Ptr("All fields test"),
106-
DiskSpace: extutil.Ptr(512),
105+
ExceptionMsg: new("All fields test"),
106+
DiskSpace: new(512),
107107
},
108108
expected: map[string]*string{
109-
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): extutil.Ptr("mixed"),
110-
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): extutil.Ptr("60"),
111-
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): extutil.Ptr("false"),
112-
fmt.Sprintf("Steadybit:FaultInjection:%s:StatusCode", targetName): extutil.Ptr("404"),
113-
fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MinimumLatency", targetName): extutil.Ptr("200"),
114-
fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MaximumLatency", targetName): extutil.Ptr("800"),
115-
fmt.Sprintf("Steadybit:FaultInjection:%s:Exception:Message", targetName): extutil.Ptr("All fields test"),
116-
fmt.Sprintf("Steadybit:FaultInjection:%s:FillDisk:Megabytes", targetName): extutil.Ptr("512"),
109+
fmt.Sprintf("Steadybit:FaultInjection:%s:Injection", targetName): new("mixed"),
110+
fmt.Sprintf("Steadybit:FaultInjection:%s:Rate", targetName): new("60"),
111+
fmt.Sprintf("Steadybit:FaultInjection:%s:Enabled", targetName): new("false"),
112+
fmt.Sprintf("Steadybit:FaultInjection:%s:StatusCode", targetName): new("404"),
113+
fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MinimumLatency", targetName): new("200"),
114+
fmt.Sprintf("Steadybit:FaultInjection:%s:Delay:MaximumLatency", targetName): new("800"),
115+
fmt.Sprintf("Steadybit:FaultInjection:%s:Exception:Message", targetName): new("All fields test"),
116+
fmt.Sprintf("Steadybit:FaultInjection:%s:FillDisk:Megabytes", targetName): new("512"),
117117
},
118118
},
119119
}
@@ -181,13 +181,13 @@ func TestAzureFunctionAction_Prepare(t *testing.T) {
181181
},
182182
request: action_kit_api.PrepareActionRequestBody{
183183
ExecutionContext: &action_kit_api.ExecutionContext{
184-
ExperimentKey: extutil.Ptr("test-experiment"),
185-
ExecutionId: extutil.Ptr(123),
184+
ExperimentKey: new("test-experiment"),
185+
ExecutionId: new(123),
186186
},
187187
},
188188
expectedState: AppConfigurationActionState{
189-
ExperimentKey: extutil.Ptr("test-experiment"),
190-
ExecutionId: extutil.Ptr(123),
189+
ExperimentKey: new("test-experiment"),
190+
ExecutionId: new(123),
191191
Config: &FaultInjectionConfig{
192192
Injection: "exception",
193193
Rate: 50,
@@ -203,8 +203,8 @@ func TestAzureFunctionAction_Prepare(t *testing.T) {
203203
},
204204
request: action_kit_api.PrepareActionRequestBody{
205205
ExecutionContext: &action_kit_api.ExecutionContext{
206-
ExperimentKey: extutil.Ptr("test-experiment"),
207-
ExecutionId: extutil.Ptr(123),
206+
ExperimentKey: new("test-experiment"),
207+
ExecutionId: new(123),
208208
},
209209
},
210210
expectedState: AppConfigurationActionState{},

‎appconfig/common.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package appconfig
22

33
import (
44
"github.com/steadybit/action-kit/go/action_kit_api/v2"
5-
"github.com/steadybit/extension-kit/extutil"
65
)
76

87
const (
@@ -13,7 +12,7 @@ const (
1312
var (
1413
azureFunctionTargetSelection = action_kit_api.TargetSelection{
1514
TargetType: TargetIDAzureAppConfiguration,
16-
SelectionTemplates: extutil.Ptr([]action_kit_api.TargetSelectionTemplate{
15+
SelectionTemplates: new([]action_kit_api.TargetSelectionTemplate{
1716
{
1817
Label: "function name",
1918
Query: "app-configuration.resource.id=\"\"",

‎appcontainers/app_container_discovery.go‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/steadybit/extension-azure/common"
2020
"github.com/steadybit/extension-azure/config"
2121
"github.com/steadybit/extension-kit/extbuild"
22-
"github.com/steadybit/extension-kit/extutil"
2322
)
2423

2524
type appContainerDiscovery struct {
@@ -42,9 +41,9 @@ func (a *appContainerDiscovery) DescribeTarget() discovery_kit_api.TargetDescrip
4241
return discovery_kit_api.TargetDescription{
4342
Id: TargetIDContainerApp,
4443
Version: extbuild.GetSemverVersionStringOrUnknown(),
45-
Icon: extutil.Ptr(targetIcon),
44+
Icon: new(targetIcon),
4645
Label: discovery_kit_api.PluralLabel{One: "Container App", Other: "Container Apps"},
47-
Category: extutil.Ptr("cloud"),
46+
Category: new("cloud"),
4847
Table: discovery_kit_api.Table{
4948
Columns: []discovery_kit_api.Column{
5049
{Attribute: "steadybit.label"},
@@ -99,7 +98,7 @@ func (a *appContainerDiscovery) Describe() discovery_kit_api.DiscoveryDescriptio
9998
return discovery_kit_api.DiscoveryDescription{
10099
Id: TargetIDContainerApp,
101100
Discover: discovery_kit_api.DescribingEndpointReferenceWithCallInterval{
102-
CallInterval: extutil.Ptr("30s"),
101+
CallInterval: new("30s"),
103102
},
104103
}
105104
}
@@ -113,7 +112,7 @@ func (a *appContainerDiscovery) DiscoverTargets(ctx context.Context) ([]discover
113112
}
114113

115114
// safeToString safely converts any value to string
116-
func safeToString(value interface{}) string {
115+
func safeToString(value any) string {
117116
if value == nil {
118117
return ""
119118
}
@@ -141,7 +140,7 @@ func getAllContainerApps(ctx context.Context, client common.ArmResourceGraphApi)
141140

142141
var subscriptions []*string
143142
if subscriptionId != "" {
144-
subscriptions = []*string{to.Ptr(subscriptionId)}
143+
subscriptions = []*string{new(subscriptionId)}
145144
}
146145

147146
cred, err := common.ConnectionAzure()
@@ -162,7 +161,7 @@ func getAllContainerApps(ctx context.Context, client common.ArmResourceGraphApi)
162161

163162
results, err := client.Resources(ctx,
164163
armresourcegraph.QueryRequest{
165-
Query: to.Ptr(query),
164+
Query: new(query),
166165
Options: &armresourcegraph.QueryRequestOptions{
167166
ResultFormat: to.Ptr(armresourcegraph.ResultFormatObjectArray),
168167
},
@@ -176,9 +175,9 @@ func getAllContainerApps(ctx context.Context, client common.ArmResourceGraphApi)
176175

177176
targets := make([]discovery_kit_api.Target, 0)
178177

179-
if m, ok := results.Data.([]interface{}); ok {
178+
if m, ok := results.Data.([]any); ok {
180179
for _, r := range m {
181-
items := r.(map[string]interface{})
180+
items := r.(map[string]any)
182181
attributes := make(map[string][]string)
183182

184183
// Add basic attributes
@@ -204,9 +203,9 @@ func getAllContainerApps(ctx context.Context, client common.ArmResourceGraphApi)
204203
}
205204

206205
// Add configuration information
207-
if configuration, ok := properties["configuration"].(map[string]interface{}); ok {
206+
if configuration, ok := properties["configuration"].(map[string]any); ok {
208207
// Add ingress information
209-
if ingress, ok := configuration["ingress"].(map[string]interface{}); ok {
208+
if ingress, ok := configuration["ingress"].(map[string]any); ok {
210209
if fqdn, ok := ingress["fqdn"]; ok && fqdn != nil {
211210
attributes["container-app.ingress.fqdn"] = []string{safeToString(fqdn)}
212211
}
@@ -225,9 +224,9 @@ func getAllContainerApps(ctx context.Context, client common.ArmResourceGraphApi)
225224
}
226225

227226
// Add template information
228-
if template, ok := properties["template"].(map[string]interface{}); ok {
227+
if template, ok := properties["template"].(map[string]any); ok {
229228
// Add scale information
230-
if scale, ok := template["scale"].(map[string]interface{}); ok {
229+
if scale, ok := template["scale"].(map[string]any); ok {
231230
if minReplicas, ok := scale["minReplicas"]; ok {
232231
attributes["container-app.scale.min-replicas"] = []string{safeToString(minReplicas)}
233232
}
@@ -237,10 +236,10 @@ func getAllContainerApps(ctx context.Context, client common.ArmResourceGraphApi)
237236
}
238237

239238
// Add container information
240-
if containers, ok := template["containers"].([]interface{}); ok && len(containers) > 0 {
239+
if containers, ok := template["containers"].([]any); ok && len(containers) > 0 {
241240
containerNames := make([]string, 0, len(containers))
242241
for _, container := range containers {
243-
if containerMap, ok := container.(map[string]interface{}); ok {
242+
if containerMap, ok := container.(map[string]any); ok {
244243
if name, ok := containerMap["name"]; ok {
245244
containerNames = append(containerNames, safeToString(name))
246245
}

0 commit comments

Comments
 (0)