Skip to content

Commit

Permalink
Set labels on unmanaged eip creation (#347)
Browse files Browse the repository at this point in the history 
This PR fixes the bug where labels are not set on on unmanaged (no
healthcheck block) EIP creation.
Updates tests to have one for managed (IPv4) and one for unmanaged
(IPv6) EIP.
  • Loading branch information
@kobajagi
kobajagi authored Apr 16, 2024
1 parent 967269a commit a0f2db7
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 100 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ BUG FIXES:
- Fix dbaas bugs causing accepteance tests to fail #346
- docs: fix example in index.md #345

BUG FIXES:

- Set labels on unmanaged eip creation #347

## 0.57.0 (April 3, 2024)

FEATURES:
Expand Down
16 changes: 8 additions & 8 deletions exoscale/resource_exoscale_elastic_ip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,14 @@ func resourceElasticIPCreate(ctx context.Context, d *schema.ResourceData, meta i
elasticIP.Description = &s
}

if l, ok := d.GetOk(resElasticIPAttrLabels); ok {
labels := make(map[string]string)
for k, v := range l.(map[string]interface{}) {
labels[k] = v.(string)
}
elasticIP.Labels = &labels
}

if healthcheckMode, ok := d.GetOk(resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckMode)); ok {
elasticIPHealthcheck := egoscale.ElasticIPHealthcheck{
Mode: nonEmptyStringPtr(healthcheckMode.(string)),
Expand Down Expand Up @@ -244,14 +252,6 @@ func resourceElasticIPCreate(ctx context.Context, d *schema.ResourceData, meta i
}

elasticIP.Healthcheck = &elasticIPHealthcheck

if l, ok := d.GetOk(resElasticIPAttrLabels); ok {
labels := make(map[string]string)
for k, v := range l.(map[string]interface{}) {
labels[k] = v.(string)
}
elasticIP.Labels = &labels
}
}

elasticIP, err := client.CreateElasticIP(ctx, zone, elasticIP)
Expand Down
104 changes: 12 additions & 92 deletions exoscale/resource_exoscale_elastic_ip_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,6 @@ resource "exoscale_elastic_ip" "test6" {
description = "%s"
address_family = "%s"
healthcheck {
mode = "%s"
port = %d
uri = "%s"
interval = %d
timeout = %d
strikes_ok = %d
strikes_fail = %d
}
reverse_dns = "%s"
labels = {
Expand All @@ -174,13 +164,6 @@ resource "exoscale_elastic_ip" "test6" {
testZoneName,
testAccResourceElasticIPDescription,
testAccResourceElasticIPAddressFamily6,
testAccResourceElasticIPHealthcheckMode,
testAccResourceElasticIPHealthcheckPort,
testAccResourceElasticIPHealthcheckURI,
testAccResourceElasticIPHealthcheckInterval,
testAccResourceElasticIPHealthcheckTimeout,
testAccResourceElasticIPHealthcheckStrikesOK,
testAccResourceElasticIPHealthcheckStrikesFail,
testAccResourceElasticIPReverseDNS,
testAccResourceElasticIPLabelValue,
)
Expand All @@ -191,18 +174,6 @@ resource "exoscale_elastic_ip" "test6" {
description = "%s"
address_family = "%s"
healthcheck {
mode = "%s"
port = %d
uri = "%s"
interval = %d
timeout = %d
strikes_ok = %d
strikes_fail = %d
tls_sni = "%s"
tls_skip_verify = true
}
reverse_dns = ""
labels = {
Expand All @@ -213,14 +184,6 @@ resource "exoscale_elastic_ip" "test6" {
testZoneName,
testAccResourceElasticIPDescriptionUpdated,
testAccResourceElasticIPAddressFamily6,
testAccResourceElasticIPHealthcheckModeUpdated,
testAccResourceElasticIPHealthcheckPortUpdated,
testAccResourceElasticIPHealthcheckURIUpdated,
testAccResourceElasticIPHealthcheckIntervalUpdated,
testAccResourceElasticIPHealthcheckTimeoutUpdated,
testAccResourceElasticIPHealthcheckStrikesOKUpdated,
testAccResourceElasticIPHealthcheckStrikesFailUpdated,
testAccResourceElasticIPHealthcheckTLSSNI,
testAccResourceElasticIPLabelValueUpdated,
)
)
Expand Down Expand Up @@ -411,31 +374,16 @@ func TestAccResourceElasticIP(t *testing.T) {

a.Equal(testAccResourceElasticIPAddressFamily6, *elasticIP6.AddressFamily)
a.Equal(testAccResourceElasticIPDescription, *elasticIP6.Description)
a.NotNil(elasticIP6.Healthcheck)
a.Equal(testAccResourceElasticIPHealthcheckInterval, int64(elasticIP6.Healthcheck.Interval.Seconds()))
a.Equal(testAccResourceElasticIPHealthcheckMode, *elasticIP6.Healthcheck.Mode)
a.Equal(testAccResourceElasticIPHealthcheckPort, *elasticIP6.Healthcheck.Port)
a.Equal(testAccResourceElasticIPHealthcheckStrikesFail, *elasticIP6.Healthcheck.StrikesFail)
a.Equal(testAccResourceElasticIPHealthcheckStrikesOK, *elasticIP6.Healthcheck.StrikesOK)
a.Equal(testAccResourceElasticIPHealthcheckTimeout, int64(elasticIP6.Healthcheck.Timeout.Seconds()))
a.Equal(testAccResourceElasticIPHealthcheckURI, *elasticIP6.Healthcheck.URI)

return nil
},
checkResourceState(r6, checkResourceStateValidateAttributes(testAttrs{
resElasticIPAttrDescription: validateString(testAccResourceElasticIPDescription),
resElasticIPAttrAddressFamily: validateString(testAccResourceElasticIPAddressFamily6),
resElasticIPAttrCIDR: validation.ToDiagFunc(validation.IsCIDR),
resElasticIPAttrIPAddress: validation.ToDiagFunc(validation.IsIPAddress),
resElasticIPAttrReverseDNS: validateString(testAccResourceElasticIPReverseDNS),
resElasticIPAttrLabels + ".test": validateString(testAccResourceElasticIPLabelValue),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckInterval): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckInterval)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckMode): validateString(testAccResourceElasticIPHealthcheckMode),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckPort): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckPort)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckStrikesFail): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckStrikesFail)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckStrikesOK): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckStrikesOK)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckTimeout): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckTimeout)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckURI): validateString(testAccResourceElasticIPHealthcheckURI),
resElasticIPAttrDescription: validateString(testAccResourceElasticIPDescription),
resElasticIPAttrAddressFamily: validateString(testAccResourceElasticIPAddressFamily6),
resElasticIPAttrCIDR: validation.ToDiagFunc(validation.IsCIDR),
resElasticIPAttrIPAddress: validation.ToDiagFunc(validation.IsIPAddress),
resElasticIPAttrReverseDNS: validateString(testAccResourceElasticIPReverseDNS),
resElasticIPAttrLabels + ".test": validateString(testAccResourceElasticIPLabelValue),
})),
),
},
Expand All @@ -448,16 +396,6 @@ func TestAccResourceElasticIP(t *testing.T) {
a := assert.New(t)

a.Equal(testAccResourceElasticIPDescriptionUpdated, *elasticIP6.Description)
a.NotNil(elasticIP6.Healthcheck)
a.Equal(testAccResourceElasticIPHealthcheckIntervalUpdated, int64(elasticIP6.Healthcheck.Interval.Seconds()))
a.Equal(testAccResourceElasticIPHealthcheckModeUpdated, *elasticIP6.Healthcheck.Mode)
a.Equal(testAccResourceElasticIPHealthcheckPortUpdated, *elasticIP6.Healthcheck.Port)
a.Equal(testAccResourceElasticIPHealthcheckStrikesFailUpdated, *elasticIP6.Healthcheck.StrikesFail)
a.Equal(testAccResourceElasticIPHealthcheckStrikesOKUpdated, *elasticIP6.Healthcheck.StrikesOK)
a.Equal(testAccResourceElasticIPHealthcheckTLSSNI, *elasticIP6.Healthcheck.TLSSNI)
a.True(*elasticIP6.Healthcheck.TLSSkipVerify)
a.Equal(testAccResourceElasticIPHealthcheckTimeoutUpdated, int64(elasticIP6.Healthcheck.Timeout.Seconds()))
a.Equal(testAccResourceElasticIPHealthcheckURIUpdated, *elasticIP6.Healthcheck.URI)

return nil
},
Expand All @@ -468,15 +406,6 @@ func TestAccResourceElasticIP(t *testing.T) {
resElasticIPAttrCIDR: validation.ToDiagFunc(validation.IsCIDR),
resElasticIPAttrIPAddress: validation.ToDiagFunc(validation.IsIPAddress),
resElasticIPAttrLabels + ".test": validateString(testAccResourceElasticIPLabelValueUpdated),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckInterval): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckIntervalUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckMode): validateString(testAccResourceElasticIPHealthcheckModeUpdated),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckPort): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckPortUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckStrikesFail): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckStrikesFailUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckStrikesOK): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckStrikesOKUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckTLSSNI): validateString(testAccResourceElasticIPHealthcheckTLSSNI),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckTLSSkipVerify): validateString("true"),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckTimeout): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckTimeoutUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckURI): validateString(testAccResourceElasticIPHealthcheckURIUpdated),
})),
),
},
Expand All @@ -493,21 +422,12 @@ func TestAccResourceElasticIP(t *testing.T) {
ImportStateCheck: func(s []*terraform.InstanceState) error {
return checkResourceAttributes(
testAttrs{
resElasticIPAttrDescription: validateString(testAccResourceElasticIPDescriptionUpdated),
resElasticIPAttrAddressFamily: validateString(testAccResourceElasticIPAddressFamily6),
resElasticIPAttrCIDR: validation.ToDiagFunc(validation.IsCIDR),
resElasticIPAttrIPAddress: validation.ToDiagFunc(validation.IsIPAddress),
resElasticIPAttrReverseDNS: validation.ToDiagFunc(validation.StringIsEmpty),
resElasticIPAttrLabels + ".test": validateString(testAccResourceElasticIPLabelValueUpdated),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckInterval): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckIntervalUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckMode): validateString(testAccResourceElasticIPHealthcheckModeUpdated),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckPort): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckPortUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckStrikesFail): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckStrikesFailUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckStrikesOK): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckStrikesOKUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckTLSSNI): validateString(testAccResourceElasticIPHealthcheckTLSSNI),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckTLSSkipVerify): validateString("true"),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckTimeout): validateString(fmt.Sprint(testAccResourceElasticIPHealthcheckTimeoutUpdated)),
resElasticIPAttrHealthcheck(resElasticIPAttrHealthcheckURI): validateString(testAccResourceElasticIPHealthcheckURIUpdated),
resElasticIPAttrDescription: validateString(testAccResourceElasticIPDescriptionUpdated),
resElasticIPAttrAddressFamily: validateString(testAccResourceElasticIPAddressFamily6),
resElasticIPAttrCIDR: validation.ToDiagFunc(validation.IsCIDR),
resElasticIPAttrIPAddress: validation.ToDiagFunc(validation.IsIPAddress),
resElasticIPAttrReverseDNS: validation.ToDiagFunc(validation.StringIsEmpty),
resElasticIPAttrLabels + ".test": validateString(testAccResourceElasticIPLabelValueUpdated),
},
s[0].Attributes)
},
Expand Down

0 comments on commit a0f2db7

Please # to comment.