Upgrade terraform-provider-meraki to v0.2.10-alpha (#138)

* make tfgen * make build_sdks
pulumi · Aug 6, 2024 · eae1318 · eae1318
1 parent dda9956
commit eae1318
Show file tree

Hide file tree

Showing 243 changed files with 1,990 additions and 298 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -78,12 +78,10 @@ jobs:
       shell: bash
       run: |
         # Get latest stable release. Return only first column from result (tag).
-        LAST_VERSION=$(gh release view --repo pulumi/pulumi-meraki --json tagName -q .tagName || echo "No stable release" )
+        LAST_VERSION=$(gh release view --repo pulumi/pulumi-meraki --json tagName -q .tagName)
         {
           echo 'summary<<EOF'
-          if [[ "$LAST_VERSION" != "No stable release" ]]; then
-            schema-tools compare --provider="meraki" --old-commit="$LAST_VERSION" --new-commit="--local-path=provider/cmd/pulumi-resource-meraki/schema.json"
-          fi
+          schema-tools compare --provider="meraki" --old-commit="$LAST_VERSION" --new-commit="--local-path=provider/cmd/pulumi-resource-meraki/schema.json"
           echo 'EOF'
         } >> "$GITHUB_OUTPUT"
     - name: Upload Provider Binaries

diff --git a/.pulumi-java-gen.version b/.pulumi-java-gen.version
@@ -1 +1 @@
-0.12.0
+0.13.0
diff --git a/patches/0002-patch-vlan-profiles-to-be-non-computed.patch b/patches/0002-patch-vlan-profiles-to-be-non-computed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] patch vlan profiles to be non-computed
 
 
 diff --git a/internal/provider/resource_meraki_networks_vlan_profiles.go b/internal/provider/resource_meraki_networks_vlan_profiles.go
-index ecb3f2d..250327c 100644
+index d622f59..f8e210e 100644
 --- a/internal/provider/resource_meraki_networks_vlan_profiles.go
 +++ b/internal/provider/resource_meraki_networks_vlan_profiles.go
 @@ -152,7 +152,6 @@ func (r *NetworksVLANProfilesResource) Schema(_ context.Context, _ resource.Sche

diff --git a/provider/cmd/pulumi-resource-meraki/bridge-metadata.json b/provider/cmd/pulumi-resource-meraki/bridge-metadata.json
@@ -2668,6 +2668,9 @@
                 "fields": {
                     "limit_scope_to_networks": {
                         "maxItemsOne": false
+                    },
+                    "limit_scope_to_networks_rs": {
+                        "maxItemsOne": false
                     }
                 }
             },

diff --git a/provider/cmd/pulumi-resource-meraki/schema.json b/provider/cmd/pulumi-resource-meraki/schema.json
@@ -3348,7 +3348,7 @@
                     "description": "Sets a manual channel for 5 GHz. Can be '36', '40', '44', '48', '52', '56', '60', '64', '100', '104', '108', '112', '116', '120', '124', '128', '132', '136', '140', '144', '149', '153', '157', '161', '165', '169', '173' or '177' or null for using auto channel.\n"
                 },
                 "channelWidth": {
-                    "type": "integer",
+                    "type": "string",
                     "description": "Sets a manual channel for 5 GHz. Can be '0', '20', '40', '80' or '160' or null for using auto channel width.\n"
                 },
                 "targetPower": {
@@ -6876,7 +6876,7 @@
                     "type": "integer"
                 },
                 "channelWidth": {
-                    "type": "integer"
+                    "type": "string"
                 },
                 "targetPower": {
                     "type": "integer"
@@ -7014,7 +7014,7 @@
                     "description": "Firmware version of the device\n"
                 },
                 "imei": {
-                    "type": "string",
+                    "type": "number",
                     "description": "IMEI of the device, if applicable\n"
                 },
                 "lanIp": {
@@ -45554,7 +45554,7 @@
                     "description": "Firmware version of the device\n"
                 },
                 "imei": {
-                    "type": "string",
+                    "type": "number",
                     "description": "IMEI of the device, if applicable\n"
                 },
                 "lanIp": {
@@ -52371,7 +52371,7 @@
             }
         },
         "meraki:devices/applianceRadioSettings:ApplianceRadioSettings": {
-            "description": "~\u003eWarning: This resource does not represent a real-world entity in Meraki Dashboard, therefore changing or deleting this resource on its own has no immediate effect. Instead, it is a task part of a Meraki Dashboard workflow. It is executed in Meraki without any additional verification. It does not check if it was executed before or if a similar configuration or action \nalready existed previously.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.meraki.devices.ApplianceRadioSettings;\nimport com.pulumi.meraki.devices.ApplianceRadioSettingsArgs;\nimport com.pulumi.meraki.devices.inputs.ApplianceRadioSettingsFiveGhzSettingsArgs;\nimport com.pulumi.meraki.devices.inputs.ApplianceRadioSettingsTwoFourGhzSettingsArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n    public static void main(String[] args) {\n        Pulumi.run(App::stack);\n    }\n\n    public static void stack(Context ctx) {\n        var example = new ApplianceRadioSettings(\"example\", ApplianceRadioSettingsArgs.builder()\n            .fiveGhzSettings(ApplianceRadioSettingsFiveGhzSettingsArgs.builder()\n                .channel(149)\n                .channel_width(20)\n                .target_power(15)\n                .build())\n            .rfProfileId(\"1234\")\n            .serial(\"string\")\n            .twoFourGhzSettings(ApplianceRadioSettingsTwoFourGhzSettingsArgs.builder()\n                .channel(11)\n                .target_power(21)\n                .build())\n            .build());\n\n        ctx.export(\"merakiDevicesApplianceRadioSettingsExample\", example);\n    }\n}\n```\n```yaml\nresources:\n  example:\n    type: meraki:devices:ApplianceRadioSettings\n    properties:\n      fiveGhzSettings:\n        channel: 149\n        channel_width: 20\n        target_power: 15\n      rfProfileId: '1234'\n      serial: string\n      twoFourGhzSettings:\n        channel: 11\n        target_power: 21\noutputs:\n  merakiDevicesApplianceRadioSettingsExample: ${example}\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\n```sh\n$ pulumi import meraki:devices/applianceRadioSettings:ApplianceRadioSettings example \"serial\"\n```\n\n",
+            "description": "~\u003eWarning: This resource does not represent a real-world entity in Meraki Dashboard, therefore changing or deleting this resource on its own has no immediate effect. Instead, it is a task part of a Meraki Dashboard workflow. It is executed in Meraki without any additional verification. It does not check if it was executed before or if a similar configuration or action \nalready existed previously.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.meraki.devices.ApplianceRadioSettings;\nimport com.pulumi.meraki.devices.ApplianceRadioSettingsArgs;\nimport com.pulumi.meraki.devices.inputs.ApplianceRadioSettingsFiveGhzSettingsArgs;\nimport com.pulumi.meraki.devices.inputs.ApplianceRadioSettingsTwoFourGhzSettingsArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n    public static void main(String[] args) {\n        Pulumi.run(App::stack);\n    }\n\n    public static void stack(Context ctx) {\n        var example = new ApplianceRadioSettings(\"example\", ApplianceRadioSettingsArgs.builder()\n            .fiveGhzSettings(ApplianceRadioSettingsFiveGhzSettingsArgs.builder()\n                .channel(149)\n                .channel_width(\"20\")\n                .target_power(15)\n                .build())\n            .rfProfileId(\"1234\")\n            .serial(\"string\")\n            .twoFourGhzSettings(ApplianceRadioSettingsTwoFourGhzSettingsArgs.builder()\n                .channel(11)\n                .target_power(21)\n                .build())\n            .build());\n\n        ctx.export(\"merakiDevicesApplianceRadioSettingsExample\", example);\n    }\n}\n```\n```yaml\nresources:\n  example:\n    type: meraki:devices:ApplianceRadioSettings\n    properties:\n      fiveGhzSettings:\n        channel: 149\n        channel_width: '20'\n        target_power: 15\n      rfProfileId: '1234'\n      serial: string\n      twoFourGhzSettings:\n        channel: 11\n        target_power: 21\noutputs:\n  merakiDevicesApplianceRadioSettingsExample: ${example}\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\n```sh\n$ pulumi import meraki:devices/applianceRadioSettings:ApplianceRadioSettings example \"serial\"\n```\n\n",
             "properties": {
                 "fiveGhzSettings": {
                     "$ref": "#/types/meraki:devices/ApplianceRadioSettingsFiveGhzSettings:ApplianceRadioSettingsFiveGhzSettings",
@@ -69605,6 +69605,13 @@
                     },
                     "description": "Networks assigned to the Early Access Feature\n"
                 },
+                "limitScopeToNetworksRs": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "Networks assigned to the Early Access Feature\n"
+                },
                 "optInId": {
                     "type": "string",
                     "description": "optInId path parameter. Opt in ID\n"
@@ -69621,6 +69628,7 @@
             "required": [
                 "createdAt",
                 "limitScopeToNetworks",
+                "limitScopeToNetworksRs",
                 "organizationId",
                 "shortName"
             ],
@@ -69632,6 +69640,13 @@
                     },
                     "description": "Networks assigned to the Early Access Feature\n"
                 },
+                "limitScopeToNetworksRs": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "Networks assigned to the Early Access Feature\n"
+                },
                 "optInId": {
                     "type": "string",
                     "description": "optInId path parameter. Opt in ID\n"
@@ -69662,6 +69677,13 @@
                         },
                         "description": "Networks assigned to the Early Access Feature\n"
                     },
+                    "limitScopeToNetworksRs": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        },
+                        "description": "Networks assigned to the Early Access Feature\n"
+                    },
                     "optInId": {
                         "type": "string",
                         "description": "optInId path parameter. Opt in ID\n"

diff --git a/provider/go.mod b/provider/go.mod
@@ -139,7 +139,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/meraki/dashboard-api-go/v3 v3.0.7 // indirect
+	github.com/meraki/dashboard-api-go/v3 v3.0.9 // indirect
 	github.com/mitchellh/cli v1.1.5 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect

diff --git a/provider/go.sum b/provider/go.sum
@@ -664,8 +664,8 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/meraki/dashboard-api-go/v3 v3.0.7 h1:B7P36Wb3R3MC4Aus1CzJo4AYtiEl5dP1EQgI7uDz8mY=
-github.com/meraki/dashboard-api-go/v3 v3.0.7/go.mod h1:ngZmCzPKto29KbttUw7ibrLc+5RHHBKihYFkWFrL1zE=
+github.com/meraki/dashboard-api-go/v3 v3.0.9 h1:l3VIHu+0Jy1GysHe2sSLxp+wVhY6EB2Ng3e8/ygVBXE=
+github.com/meraki/dashboard-api-go/v3 v3.0.9/go.mod h1:ngZmCzPKto29KbttUw7ibrLc+5RHHBKihYFkWFrL1zE=
 github.com/mitchellh/cli v1.1.5 h1:OxRIeJXpAMztws/XHlN2vu6imG5Dpq+j61AzAX5fLng=
 github.com/mitchellh/cli v1.1.5/go.mod h1:v8+iFts2sPIKUV1ltktPXMCC8fumSKFItNcD2cLtRR4=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=

diff --git a/sdk/dotnet/Devices/Inputs/WirelessRadioSettingsFiveGhzSettingsArgs.cs b/sdk/dotnet/Devices/Inputs/WirelessRadioSettingsFiveGhzSettingsArgs.cs
diff --git a/sdk/dotnet/Devices/Inputs/WirelessRadioSettingsFiveGhzSettingsGetArgs.cs b/sdk/dotnet/Devices/Inputs/WirelessRadioSettingsFiveGhzSettingsGetArgs.cs
diff --git a/sdk/dotnet/Devices/Outputs/GetWirelessRadioSettingsItemFiveGhzSettingsResult.cs b/sdk/dotnet/Devices/Outputs/GetWirelessRadioSettingsItemFiveGhzSettingsResult.cs
diff --git a/sdk/dotnet/Devices/Outputs/WirelessRadioSettingsFiveGhzSettings.cs b/sdk/dotnet/Devices/Outputs/WirelessRadioSettingsFiveGhzSettings.cs
diff --git a/sdk/dotnet/Organizations/EarlyAccessFeaturesOptIns.cs b/sdk/dotnet/Organizations/EarlyAccessFeaturesOptIns.cs
diff --git a/sdk/dotnet/Organizations/Outputs/GetDevicesItemResult.cs b/sdk/dotnet/Organizations/Outputs/GetDevicesItemResult.cs
diff --git a/sdk/dotnet/Outputs/GetDevicesItemResult.cs b/sdk/dotnet/Outputs/GetDevicesItemResult.cs