Skip to content

Commit

Permalink
patch vlan names (#109)
Browse files Browse the repository at this point in the history
fixes #97 with a patch while we resolve the underlying bridge issue.

I've set the name property on the vlan_names to be non-computed - this works around the bridge issue.

I believe this patch is perfectly safe to take - name is not really computed - the resource does not actually work if not specified.
  • Loading branch information
VenelinMartinov authored Jul 12, 2024
1 parent 2e72cb2 commit cac4181
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ sdk/java/gradlew.bat

sdk/python/venv

sdk/dotnet/logo.png
sdk/dotnet/logo.png

go.work
go.work.sum
2 changes: 1 addition & 1 deletion patches/0001-Add-shim.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Add shim

diff --git a/meraki/shim.go b/meraki/shim.go
new file mode 100644
index 0000000..895da58
index 0000000..1104b47
--- /dev/null
+++ b/meraki/shim.go
@@ -0,0 +1,12 @@
Expand Down
18 changes: 18 additions & 0 deletions patches/0002-patch-vlan-profiles-to-be-non-computed.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Venelin <[email protected]>
Date: Fri, 12 Jul 2024 17:27:42 +0100
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
--- 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
},
"name": schema.StringAttribute{
MarkdownDescription: `Name of the VLAN, string length must be from 1 to 32 characters`,
- Computed: true,
Optional: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
1 change: 0 additions & 1 deletion provider/cmd/pulumi-resource-meraki/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -18327,7 +18327,6 @@
"nodejs": {
"requiredOutputs": [
"adaptivePolicyGroup",
"name",
"vlanId"
]
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/nodejs/types/output.ts

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

0 comments on commit cac4181

Please sign in to comment.