From a02c82db8d0c3076621613115249e23e2d72d2b2 Mon Sep 17 00:00:00 2001 From: Kuba Mazurkiewicz <132581633+kuba-mazurkiewicz@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:05:28 +0100 Subject: [PATCH] Fix typos in attribute names in wireless ssid resource (#154) --- CHANGELOG.md | 2 ++ docs/data-sources/wireless_ssid.md | 4 +-- docs/guides/changelog.md | 2 ++ docs/resources/wireless_ssid.md | 4 +-- gen/definitions/wireless_ssid.yaml | 4 +-- ...ata_source_catalystcenter_wireless_ssid.go | 4 +-- .../model_catalystcenter_wireless_ssid.go | 36 +++++++++---------- .../resource_catalystcenter_wireless_ssid.go | 4 +-- templates/guides/changelog.md.tmpl | 2 ++ 9 files changed, 34 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aee36ff..822c080 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## 0.1.17 (unreleased) +- BREAKING CHANGE: Rename `auth_key_sae_ext_plus_tf` attribute of `catalystcenter_wireless_ssid` resource to `auth_key_sae_ext_plus_ft` +- BREAKING CHANGE: Rename `auth_key8021x_plus_tf` attribute of `catalystcenter_wireless_ssid` resource to `auth_key8021x_plus_ft` - Add device unreachability warning to `catalystcenter_anycast_gateway`, `catalystcenter_fabric_l2_handoff`, `catalystcenter_fabric_device`, `catalystcenter_fabric_port_assignment` and `catalystcenter_provision_device` resources - Add `auth_key_psk` and `auth_key_psk_plus_ft` attributes to `catalystcenter_wireless_ssid` resource and data source diff --git a/docs/data-sources/wireless_ssid.md b/docs/data-sources/wireless_ssid.md index 47cc074..7db0144 100644 --- a/docs/data-sources/wireless_ssid.md +++ b/docs/data-sources/wireless_ssid.md @@ -34,7 +34,7 @@ data "catalystcenter_wireless_ssid" "example" { - `acl_name` (String) Pre-Auth Access Control List (ACL) Name - `ap_beacon_protection` (Boolean) When set to true, the Access Point (AP) Beacon Protection feature is activated, enhancing the security of the network - `auth_key8021x` (Boolean) When set to true, the 802.1X authentication key is in use -- `auth_key8021x_plus_tf` (Boolean) When set to true, the 802.1X-Plus-FT authentication key is in use +- `auth_key8021x_plus_ft` (Boolean) When set to true, the 802.1X-Plus-FT authentication key is in use - `auth_key8021x_sha256` (Boolean) When set to true, the feature that enables 802.1X authentication using the SHA256 algorithm is turned on - `auth_key_easy_psk` (Boolean) When set to true, the feature that enables the use of Easy Pre-shared Key (PSK) authentication is activated - `auth_key_easy_psk_sha256` (Boolean) The feature that allows the use of Pre-shared Key (PSK) authentication with the SHA256 algorithm is enabled when it is set to true @@ -43,7 +43,7 @@ data "catalystcenter_wireless_ssid" "example" { - `auth_key_psk_plus_ft` (Boolean) When set to true, the feature that enables the combination of Pre-shared Key (PSK) and Fast Transition (FT) authentication keys is activated - `auth_key_sae` (Boolean) When set to true, the feature enabling the Simultaneous Authentication of Equals (SAE) authentication key is activated - `auth_key_sae_ext` (Boolean) When set to true, the Simultaneous Authentication of Equals (SAE) Extended Authentication key feature is turned on -- `auth_key_sae_ext_plus_tf` (Boolean) When set to true, the Simultaneous Authentication of Equals (SAE) combined with Fast Transition (FT) Authentication Key feature is enabled +- `auth_key_sae_ext_plus_ft` (Boolean) When set to true, the Simultaneous Authentication of Equals (SAE) combined with Fast Transition (FT) Authentication Key feature is enabled - `auth_key_sae_plus_ft` (Boolean) When set to true, the feature that enables the combination of Pre-shared Key (PSK) and Fast Transition (FT) authentication keys is activated - `auth_key_suite_b1921x` (Boolean) When set to true, the SuiteB192-1x authentication key feature is enabled - `auth_key_suite_b1x` (Boolean) When activated by setting it to true, the SuiteB-1x authentication key feature is engaged diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md index 5e32f27..4dd466b 100644 --- a/docs/guides/changelog.md +++ b/docs/guides/changelog.md @@ -9,6 +9,8 @@ description: |- ## 0.1.17 (unreleased) +- BREAKING CHANGE: Rename `auth_key_sae_ext_plus_tf` attribute of `catalystcenter_wireless_ssid` resource to `auth_key_sae_ext_plus_ft` +- BREAKING CHANGE: Rename `auth_key8021x_plus_tf` attribute of `catalystcenter_wireless_ssid` resource to `auth_key8021x_plus_ft` - Add device unreachability warning to `catalystcenter_anycast_gateway`, `catalystcenter_fabric_l2_handoff`, `catalystcenter_fabric_device`, `catalystcenter_fabric_port_assignment` and `catalystcenter_provision_device` resources - Add `auth_key_psk` and `auth_key_psk_plus_ft` attributes to `catalystcenter_wireless_ssid` resource and data source diff --git a/docs/resources/wireless_ssid.md b/docs/resources/wireless_ssid.md index dcff706..4b1f86d 100644 --- a/docs/resources/wireless_ssid.md +++ b/docs/resources/wireless_ssid.md @@ -62,7 +62,7 @@ resource "catalystcenter_wireless_ssid" "example" { - `acl_name` (String) Pre-Auth Access Control List (ACL) Name - `ap_beacon_protection` (Boolean) When set to true, the Access Point (AP) Beacon Protection feature is activated, enhancing the security of the network - `auth_key8021x` (Boolean) When set to true, the 802.1X authentication key is in use -- `auth_key8021x_plus_tf` (Boolean) When set to true, the 802.1X-Plus-FT authentication key is in use +- `auth_key8021x_plus_ft` (Boolean) When set to true, the 802.1X-Plus-FT authentication key is in use - `auth_key8021x_sha256` (Boolean) When set to true, the feature that enables 802.1X authentication using the SHA256 algorithm is turned on - `auth_key_easy_psk` (Boolean) When set to true, the feature that enables the use of Easy Pre-shared Key (PSK) authentication is activated - `auth_key_easy_psk_sha256` (Boolean) The feature that allows the use of Pre-shared Key (PSK) authentication with the SHA256 algorithm is enabled when it is set to true @@ -71,7 +71,7 @@ resource "catalystcenter_wireless_ssid" "example" { - `auth_key_psk_plus_ft` (Boolean) When set to true, the feature that enables the combination of Pre-shared Key (PSK) and Fast Transition (FT) authentication keys is activated - `auth_key_sae` (Boolean) When set to true, the feature enabling the Simultaneous Authentication of Equals (SAE) authentication key is activated - `auth_key_sae_ext` (Boolean) When set to true, the Simultaneous Authentication of Equals (SAE) Extended Authentication key feature is turned on -- `auth_key_sae_ext_plus_tf` (Boolean) When set to true, the Simultaneous Authentication of Equals (SAE) combined with Fast Transition (FT) Authentication Key feature is enabled +- `auth_key_sae_ext_plus_ft` (Boolean) When set to true, the Simultaneous Authentication of Equals (SAE) combined with Fast Transition (FT) Authentication Key feature is enabled - `auth_key_sae_plus_ft` (Boolean) When set to true, the feature that enables the combination of Pre-shared Key (PSK) and Fast Transition (FT) authentication keys is activated - `auth_key_suite_b1921x` (Boolean) When set to true, the SuiteB192-1x authentication key feature is enabled - `auth_key_suite_b1x` (Boolean) When activated by setting it to true, the SuiteB-1x authentication key feature is engaged diff --git a/gen/definitions/wireless_ssid.yaml b/gen/definitions/wireless_ssid.yaml index caa45e8..9bb7dba 100644 --- a/gen/definitions/wireless_ssid.yaml +++ b/gen/definitions/wireless_ssid.yaml @@ -204,7 +204,7 @@ attributes: description: When set to true, the 802.1X authentication key is in use exclude_test: true - model_name: isAuthKey8021xPlusFT - tf_name: auth_key8021x_plus_tf + tf_name: auth_key8021x_plus_ft type: Bool description: When set to true, the 802.1X-Plus-FT authentication key is in use exclude_test: true @@ -357,7 +357,7 @@ attributes: description: When set to true, the Simultaneous Authentication of Equals (SAE) Extended Authentication key feature is turned on example: true - model_name: isAuthKeySaeExtPlusFT - tf_name: auth_key_sae_ext_plus_tf + tf_name: auth_key_sae_ext_plus_ft type: Bool description: When set to true, the Simultaneous Authentication of Equals (SAE) combined with Fast Transition (FT) Authentication Key feature is enabled exclude_test: true diff --git a/internal/provider/data_source_catalystcenter_wireless_ssid.go b/internal/provider/data_source_catalystcenter_wireless_ssid.go index eb1eee5..92ebd93 100644 --- a/internal/provider/data_source_catalystcenter_wireless_ssid.go +++ b/internal/provider/data_source_catalystcenter_wireless_ssid.go @@ -202,7 +202,7 @@ func (d *WirelessSSIDDataSource) Schema(ctx context.Context, req datasource.Sche MarkdownDescription: "When set to true, the 802.1X authentication key is in use", Computed: true, }, - "auth_key8021x_plus_tf": schema.BoolAttribute{ + "auth_key8021x_plus_ft": schema.BoolAttribute{ MarkdownDescription: "When set to true, the 802.1X-Plus-FT authentication key is in use", Computed: true, }, @@ -316,7 +316,7 @@ func (d *WirelessSSIDDataSource) Schema(ctx context.Context, req datasource.Sche MarkdownDescription: "When set to true, the Simultaneous Authentication of Equals (SAE) Extended Authentication key feature is turned on", Computed: true, }, - "auth_key_sae_ext_plus_tf": schema.BoolAttribute{ + "auth_key_sae_ext_plus_ft": schema.BoolAttribute{ MarkdownDescription: "When set to true, the Simultaneous Authentication of Equals (SAE) combined with Fast Transition (FT) Authentication Key feature is enabled", Computed: true, }, diff --git a/internal/provider/model_catalystcenter_wireless_ssid.go b/internal/provider/model_catalystcenter_wireless_ssid.go index 292b02c..3e85229 100644 --- a/internal/provider/model_catalystcenter_wireless_ssid.go +++ b/internal/provider/model_catalystcenter_wireless_ssid.go @@ -65,7 +65,7 @@ type WirelessSSID struct { RsnCipherSuiteCcmp128 types.Bool `tfsdk:"rsn_cipher_suite_ccmp128"` Ghz6PolicyClientSteering types.Bool `tfsdk:"ghz6_policy_client_steering"` AuthKey8021x types.Bool `tfsdk:"auth_key8021x"` - AuthKey8021xPlusTf types.Bool `tfsdk:"auth_key8021x_plus_tf"` + AuthKey8021xPlusFt types.Bool `tfsdk:"auth_key8021x_plus_ft"` AuthKey8021xSha256 types.Bool `tfsdk:"auth_key8021x_sha256"` AuthKeySae types.Bool `tfsdk:"auth_key_sae"` AuthKeySaePlusFt types.Bool `tfsdk:"auth_key_sae_plus_ft"` @@ -93,7 +93,7 @@ type WirelessSSID struct { AuthKeySuiteB1x types.Bool `tfsdk:"auth_key_suite_b1x"` AuthKeySuiteB1921x types.Bool `tfsdk:"auth_key_suite_b1921x"` AuthKeySaeExt types.Bool `tfsdk:"auth_key_sae_ext"` - AuthKeySaeExtPlusTf types.Bool `tfsdk:"auth_key_sae_ext_plus_tf"` + AuthKeySaeExtPlusFt types.Bool `tfsdk:"auth_key_sae_ext_plus_ft"` ApBeaconProtection types.Bool `tfsdk:"ap_beacon_protection"` Ghz24Policy types.String `tfsdk:"ghz24_policy"` CckmTsfTolerance types.Int64 `tfsdk:"cckm_tsf_tolerance"` @@ -235,8 +235,8 @@ func (data WirelessSSID) toBody(ctx context.Context, state WirelessSSID) string if !data.AuthKey8021x.IsNull() { body, _ = sjson.Set(body, "isAuthKey8021x", data.AuthKey8021x.ValueBool()) } - if !data.AuthKey8021xPlusTf.IsNull() { - body, _ = sjson.Set(body, "isAuthKey8021xPlusFT", data.AuthKey8021xPlusTf.ValueBool()) + if !data.AuthKey8021xPlusFt.IsNull() { + body, _ = sjson.Set(body, "isAuthKey8021xPlusFT", data.AuthKey8021xPlusFt.ValueBool()) } if !data.AuthKey8021xSha256.IsNull() { body, _ = sjson.Set(body, "isAuthKey8021x_SHA256", data.AuthKey8021xSha256.ValueBool()) @@ -323,8 +323,8 @@ func (data WirelessSSID) toBody(ctx context.Context, state WirelessSSID) string if !data.AuthKeySaeExt.IsNull() { body, _ = sjson.Set(body, "isAuthKeySaeExt", data.AuthKeySaeExt.ValueBool()) } - if !data.AuthKeySaeExtPlusTf.IsNull() { - body, _ = sjson.Set(body, "isAuthKeySaeExtPlusFT", data.AuthKeySaeExtPlusTf.ValueBool()) + if !data.AuthKeySaeExtPlusFt.IsNull() { + body, _ = sjson.Set(body, "isAuthKeySaeExtPlusFT", data.AuthKeySaeExtPlusFt.ValueBool()) } if !data.ApBeaconProtection.IsNull() { body, _ = sjson.Set(body, "isApBeaconProtectionEnabled", data.ApBeaconProtection.ValueBool()) @@ -518,9 +518,9 @@ func (data *WirelessSSID) fromBody(ctx context.Context, res gjson.Result) { data.AuthKey8021x = types.BoolNull() } if value := res.Get("isAuthKey8021xPlusFT"); value.Exists() { - data.AuthKey8021xPlusTf = types.BoolValue(value.Bool()) + data.AuthKey8021xPlusFt = types.BoolValue(value.Bool()) } else { - data.AuthKey8021xPlusTf = types.BoolNull() + data.AuthKey8021xPlusFt = types.BoolNull() } if value := res.Get("isAuthKey8021x_SHA256"); value.Exists() { data.AuthKey8021xSha256 = types.BoolValue(value.Bool()) @@ -658,9 +658,9 @@ func (data *WirelessSSID) fromBody(ctx context.Context, res gjson.Result) { data.AuthKeySaeExt = types.BoolNull() } if value := res.Get("isAuthKeySaeExtPlusFT"); value.Exists() { - data.AuthKeySaeExtPlusTf = types.BoolValue(value.Bool()) + data.AuthKeySaeExtPlusFt = types.BoolValue(value.Bool()) } else { - data.AuthKeySaeExtPlusTf = types.BoolNull() + data.AuthKeySaeExtPlusFt = types.BoolNull() } if value := res.Get("isApBeaconProtectionEnabled"); value.Exists() { data.ApBeaconProtection = types.BoolValue(value.Bool()) @@ -882,10 +882,10 @@ func (data *WirelessSSID) updateFromBody(ctx context.Context, res gjson.Result) } else { data.AuthKey8021x = types.BoolNull() } - if value := res.Get("isAuthKey8021xPlusFT"); value.Exists() && !data.AuthKey8021xPlusTf.IsNull() { - data.AuthKey8021xPlusTf = types.BoolValue(value.Bool()) + if value := res.Get("isAuthKey8021xPlusFT"); value.Exists() && !data.AuthKey8021xPlusFt.IsNull() { + data.AuthKey8021xPlusFt = types.BoolValue(value.Bool()) } else { - data.AuthKey8021xPlusTf = types.BoolNull() + data.AuthKey8021xPlusFt = types.BoolNull() } if value := res.Get("isAuthKey8021x_SHA256"); value.Exists() && !data.AuthKey8021xSha256.IsNull() { data.AuthKey8021xSha256 = types.BoolValue(value.Bool()) @@ -1022,10 +1022,10 @@ func (data *WirelessSSID) updateFromBody(ctx context.Context, res gjson.Result) } else { data.AuthKeySaeExt = types.BoolNull() } - if value := res.Get("isAuthKeySaeExtPlusFT"); value.Exists() && !data.AuthKeySaeExtPlusTf.IsNull() { - data.AuthKeySaeExtPlusTf = types.BoolValue(value.Bool()) + if value := res.Get("isAuthKeySaeExtPlusFT"); value.Exists() && !data.AuthKeySaeExtPlusFt.IsNull() { + data.AuthKeySaeExtPlusFt = types.BoolValue(value.Bool()) } else { - data.AuthKeySaeExtPlusTf = types.BoolNull() + data.AuthKeySaeExtPlusFt = types.BoolNull() } if value := res.Get("isApBeaconProtectionEnabled"); value.Exists() && !data.ApBeaconProtection.IsNull() { data.ApBeaconProtection = types.BoolValue(value.Bool()) @@ -1158,7 +1158,7 @@ func (data *WirelessSSID) isNull(ctx context.Context, res gjson.Result) bool { if !data.AuthKey8021x.IsNull() { return false } - if !data.AuthKey8021xPlusTf.IsNull() { + if !data.AuthKey8021xPlusFt.IsNull() { return false } if !data.AuthKey8021xSha256.IsNull() { @@ -1242,7 +1242,7 @@ func (data *WirelessSSID) isNull(ctx context.Context, res gjson.Result) bool { if !data.AuthKeySaeExt.IsNull() { return false } - if !data.AuthKeySaeExtPlusTf.IsNull() { + if !data.AuthKeySaeExtPlusFt.IsNull() { return false } if !data.ApBeaconProtection.IsNull() { diff --git a/internal/provider/resource_catalystcenter_wireless_ssid.go b/internal/provider/resource_catalystcenter_wireless_ssid.go index 3b58f31..428c8d7 100644 --- a/internal/provider/resource_catalystcenter_wireless_ssid.go +++ b/internal/provider/resource_catalystcenter_wireless_ssid.go @@ -251,7 +251,7 @@ func (r *WirelessSSIDResource) Schema(ctx context.Context, req resource.SchemaRe MarkdownDescription: helpers.NewAttributeDescription("When set to true, the 802.1X authentication key is in use").String, Optional: true, }, - "auth_key8021x_plus_tf": schema.BoolAttribute{ + "auth_key8021x_plus_ft": schema.BoolAttribute{ MarkdownDescription: helpers.NewAttributeDescription("When set to true, the 802.1X-Plus-FT authentication key is in use").String, Optional: true, }, @@ -383,7 +383,7 @@ func (r *WirelessSSIDResource) Schema(ctx context.Context, req resource.SchemaRe MarkdownDescription: helpers.NewAttributeDescription("When set to true, the Simultaneous Authentication of Equals (SAE) Extended Authentication key feature is turned on").String, Optional: true, }, - "auth_key_sae_ext_plus_tf": schema.BoolAttribute{ + "auth_key_sae_ext_plus_ft": schema.BoolAttribute{ MarkdownDescription: helpers.NewAttributeDescription("When set to true, the Simultaneous Authentication of Equals (SAE) combined with Fast Transition (FT) Authentication Key feature is enabled").String, Optional: true, }, diff --git a/templates/guides/changelog.md.tmpl b/templates/guides/changelog.md.tmpl index 5e32f27..4dd466b 100644 --- a/templates/guides/changelog.md.tmpl +++ b/templates/guides/changelog.md.tmpl @@ -9,6 +9,8 @@ description: |- ## 0.1.17 (unreleased) +- BREAKING CHANGE: Rename `auth_key_sae_ext_plus_tf` attribute of `catalystcenter_wireless_ssid` resource to `auth_key_sae_ext_plus_ft` +- BREAKING CHANGE: Rename `auth_key8021x_plus_tf` attribute of `catalystcenter_wireless_ssid` resource to `auth_key8021x_plus_ft` - Add device unreachability warning to `catalystcenter_anycast_gateway`, `catalystcenter_fabric_l2_handoff`, `catalystcenter_fabric_device`, `catalystcenter_fabric_port_assignment` and `catalystcenter_provision_device` resources - Add `auth_key_psk` and `auth_key_psk_plus_ft` attributes to `catalystcenter_wireless_ssid` resource and data source