Skip to content

Commit

Permalink
Upgrade terraform-provider-meraki to v0.2.6-alpha (#118)
Browse files Browse the repository at this point in the history
* make tfgen

* make build_sdks
  • Loading branch information
iwahbe authored Jul 15, 2024
1 parent d55e5f5 commit 6257949
Show file tree
Hide file tree
Showing 50 changed files with 2,333 additions and 697 deletions.
2 changes: 1 addition & 1 deletion patches/0002-patch-vlan-profiles-to-be-non-computed.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 80dbca9..3cb4b2e 100644
index ecb3f2d..250327c 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
Expand Down
4 changes: 2 additions & 2 deletions patches/0003-patch-appliance-vlans.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] patch appliance vlans


diff --git a/internal/provider/resource_meraki_networks_appliance_vlans.go b/internal/provider/resource_meraki_networks_appliance_vlans.go
index 4202af8..e4a56b6 100644
index ba91826..a93dc83 100644
--- a/internal/provider/resource_meraki_networks_appliance_vlans.go
+++ b/internal/provider/resource_meraki_networks_appliance_vlans.go
@@ -358,7 +358,6 @@ func (r *NetworksApplianceVLANsResource) Schema(_ context.Context, _ resource.Sc
@@ -362,7 +362,6 @@ func (r *NetworksApplianceVLANsResource) Schema(_ context.Context, _ resource.Sc

"comment": schema.StringAttribute{
MarkdownDescription: `A text comment for the reserved range`,
Expand Down
18 changes: 16 additions & 2 deletions provider/cmd/pulumi-resource-meraki/bridge-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,14 @@
"elem": {
"fields": {
"definitions": {
"maxItemsOne": false
"maxItemsOne": false,
"elem": {
"fields": {
"value_list": {
"maxItemsOne": false
}
}
}
}
}
}
Expand Down Expand Up @@ -2248,7 +2255,14 @@
"current": "meraki:networks/wirelessSsidsFirewallL7FirewallRules:WirelessSsidsFirewallL7FirewallRules",
"fields": {
"rules": {
"maxItemsOne": false
"maxItemsOne": false,
"elem": {
"fields": {
"value_list": {
"maxItemsOne": false
}
}
}
}
}
},
Expand Down
87 changes: 68 additions & 19 deletions provider/cmd/pulumi-resource-meraki/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -8712,14 +8712,46 @@
"value": {
"type": "string",
"description": "If \"type\" is 'host', 'port', 'ipRange' or 'localNet', then \"value\" must be a string, matching either\na hostname (e.g. \"somesite.com\"), a port (e.g. 8080), or an IP range (\"192.1.0.0\",\n\"192.1.0.0/16\", or \"10.1.0.0/16:80\"). 'localNet' also supports CIDR notation, excluding\ncustom ports.\n If \"type\" is 'application' or 'applicationCategory', then \"value\" must be an object\nwith the structure { \"id\": \"meraki:layer7/...\" }, where \"id\" is the application category or\napplication ID (for a list of IDs for your network, use the trafficShaping/applicationCategories\nendpoint).\n"
},
"valueLists": {
"type": "array",
"items": {
"type": "string"
},
"description": "The 'value_list' of what you want to block. Send a list in request\n"
},
"valueObj": {
"$ref": "#/types/meraki:networks/ApplianceTrafficShapingRulesRuleDefinitionValueObj:ApplianceTrafficShapingRulesRuleDefinitionValueObj",
"description": "The 'value_obj' of what you want to block. Send a dict in request\n"
}
},
"type": "object",
"language": {
"nodejs": {
"requiredOutputs": [
"type",
"value"
"value",
"valueLists",
"valueObj"
]
}
}
},
"meraki:networks/ApplianceTrafficShapingRulesRuleDefinitionValueObj:ApplianceTrafficShapingRulesRuleDefinitionValueObj": {
"properties": {
"id": {
"type": "string"
},
"name": {
"type": "string"
}
},
"type": "object",
"language": {
"nodejs": {
"requiredOutputs": [
"id",
"name"
]
}
}
Expand Down Expand Up @@ -18760,14 +18792,7 @@
"description": "Flex radios by model.\n"
}
},
"type": "object",
"language": {
"nodejs": {
"requiredOutputs": [
"byModels"
]
}
}
"type": "object"
},
"meraki:networks/WirelessRfProfilesFlexRadiosByModel:WirelessRfProfilesFlexRadiosByModel": {
"properties": {
Expand All @@ -18783,15 +18808,7 @@
"description": "Model of the AP\n"
}
},
"type": "object",
"language": {
"nodejs": {
"requiredOutputs": [
"bands",
"model"
]
}
}
"type": "object"
},
"meraki:networks/WirelessRfProfilesPerSsidSettings:WirelessRfProfilesPerSsidSettings": {
"properties": {
Expand Down Expand Up @@ -20220,6 +20237,17 @@
"value": {
"type": "string",
"description": "The value of what needs to get blocked. Format of the value varies depending on type of the firewall rule selected.\n"
},
"valueLists": {
"type": "array",
"items": {
"type": "string"
},
"description": "The 'value_list' of what you want to block. Send a list in request\n"
},
"valueObj": {
"$ref": "#/types/meraki:networks/WirelessSsidsFirewallL7FirewallRulesRuleValueObj:WirelessSsidsFirewallL7FirewallRulesRuleValueObj",
"description": "The 'value_obj' of what you want to block. Send a dict in request\n"
}
},
"type": "object",
Expand All @@ -20233,6 +20261,17 @@
}
}
},
"meraki:networks/WirelessSsidsFirewallL7FirewallRulesRuleValueObj:WirelessSsidsFirewallL7FirewallRulesRuleValueObj": {
"properties": {
"id": {
"type": "string"
},
"name": {
"type": "string"
}
},
"type": "object"
},
"meraki:networks/WirelessSsidsGre:WirelessSsidsGre": {
"properties": {
"concentrator": {
Expand Down Expand Up @@ -63216,6 +63255,10 @@
"type": "string",
"description": "IPv4 default gateway\n"
},
"defaultGatewayResponse": {
"type": "string",
"description": "IPv4 default gateway\n"
},
"interfaceId": {
"type": "string",
"description": "The id\n"
Expand Down Expand Up @@ -63263,6 +63306,7 @@
},
"required": [
"defaultGateway",
"defaultGatewayResponse",
"interfaceId",
"interfaceIp",
"ipv6",
Expand Down Expand Up @@ -63332,6 +63376,10 @@
"type": "string",
"description": "IPv4 default gateway\n"
},
"defaultGatewayResponse": {
"type": "string",
"description": "IPv4 default gateway\n"
},
"interfaceId": {
"type": "string",
"description": "The id\n"
Expand Down Expand Up @@ -65015,11 +65063,11 @@
"bandSelectionType",
"clientBalancingEnabled",
"fiveGhzSettings",
"flexRadios",
"minBitrateType",
"name",
"networkId",
"perSsidSettings",
"rfProfileId",
"sixGhzSettings",
"transmission",
"twoFourGhzSettings"
Expand Down Expand Up @@ -66807,6 +66855,7 @@
"email",
"expiresAt",
"groupPolicyId",
"identityPskId",
"name",
"networkId",
"number",
Expand Down
2 changes: 1 addition & 1 deletion provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.4 // indirect
github.com/meraki/dashboard-api-go/v3 v3.0.6 // 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
Expand Down
4 changes: 2 additions & 2 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,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.4 h1:JLqU19U9iMalqk5zxwlrbOpd+j/C1Hgo86R76RSdGKM=
github.com/meraki/dashboard-api-go/v3 v3.0.4/go.mod h1:ngZmCzPKto29KbttUw7ibrLc+5RHHBKihYFkWFrL1zE=
github.com/meraki/dashboard-api-go/v3 v3.0.6 h1:PTAziVh280xNT1O8n2JGI1AF4eeOoqeW/jsxU5/l6PU=
github.com/meraki/dashboard-api-go/v3 v3.0.6/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=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6257949

Please sign in to comment.