Skip to content

Commit 7316ef1

Browse files
author
wafuwafu13
committed
fix: []*string -> []string
1 parent 8dbfe7b commit 7316ef1

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

events/ecs_container_instance.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ type ECSContainerInstanceEventAttribute struct {
3636
}
3737

3838
type ECSContainerInstanceEventResource struct {
39-
Name string `json:"name"`
40-
Type string `json:"type"`
41-
IntegerValue int `json:"integerValue,omitempty"`
42-
StringSetValue []*string `json:"stringSetValue,omitempty"`
39+
Name string `json:"name"`
40+
Type string `json:"type"`
41+
IntegerValue int `json:"integerValue,omitempty"`
42+
StringSetValue []string `json:"stringSetValue,omitempty"`
4343
}
4444

4545
type ECSContainerInstanceEventVersionInfo struct {

events/ecs_container_instance_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ func TestECSContainerInstanceEventMarshaling(t *testing.T) {
4848
assert.Equal(t, 3767, detail.RegisteredResources[1].IntegerValue)
4949
assert.Equal(t, "PORTS", detail.RegisteredResources[2].Name)
5050
assert.Equal(t, "STRINGSET", detail.RegisteredResources[2].Type)
51-
assert.Equal(t, []*string{ptr("22"), ptr("2376"), ptr("2375"), ptr("51678"), ptr("51679")}, detail.RegisteredResources[2].StringSetValue)
51+
assert.Equal(t, []string{"22", "2376", "2375", "51678", "51679"}, detail.RegisteredResources[2].StringSetValue)
5252
assert.Equal(t, "PORTS_UDP", detail.RegisteredResources[3].Name)
5353
assert.Equal(t, "STRINGSET", detail.RegisteredResources[3].Type)
54-
assert.Equal(t, []*string{}, detail.RegisteredResources[3].StringSetValue)
54+
assert.Equal(t, []string{}, detail.RegisteredResources[3].StringSetValue)
5555
assert.Equal(t, "CPU", detail.RemainingResources[0].Name)
5656
assert.Equal(t, "INTEGER", detail.RemainingResources[0].Type)
5757
assert.Equal(t, 1988, detail.RemainingResources[0].IntegerValue)
@@ -60,10 +60,10 @@ func TestECSContainerInstanceEventMarshaling(t *testing.T) {
6060
assert.Equal(t, 767, detail.RemainingResources[1].IntegerValue)
6161
assert.Equal(t, "PORTS", detail.RemainingResources[2].Name)
6262
assert.Equal(t, "STRINGSET", detail.RemainingResources[2].Type)
63-
assert.Equal(t, []*string{ptr("22"), ptr("2376"), ptr("2375"), ptr("51678"), ptr("51679")}, detail.RemainingResources[2].StringSetValue)
63+
assert.Equal(t, []string{"22", "2376", "2375", "51678", "51679"}, detail.RemainingResources[2].StringSetValue)
6464
assert.Equal(t, "PORTS_UDP", detail.RemainingResources[3].Name)
6565
assert.Equal(t, "STRINGSET", detail.RemainingResources[3].Type)
66-
assert.Equal(t, []*string{}, detail.RemainingResources[3].StringSetValue)
66+
assert.Equal(t, []string{}, detail.RemainingResources[3].StringSetValue)
6767
assert.Equal(t, "ACTIVE", detail.Status)
6868
assert.Equal(t, 14801, detail.Version)
6969
assert.Equal(t, "aebcbca", detail.VersionInfo.AgentHash)
@@ -85,10 +85,6 @@ func TestECSContainerInstanceEventMarshaling(t *testing.T) {
8585
assert.JSONEq(t, string(inputJSON), string(outputJSON))
8686
}
8787

88-
func ptr(s string) *string {
89-
return &s
90-
}
91-
9288
func TestECSContainerInstanceMarshalingMalformedJson(t *testing.T) {
9389
test.TestMalformedJson(t, ECSContainerInstanceEvent{})
9490
}

0 commit comments

Comments
 (0)