Skip to content

Commit

Permalink
Upgrade terraform-provider-tailscale to v0.13.13 (#287)
Browse files Browse the repository at this point in the history
This PR was generated via `$ upgrade-provider pulumi/pulumi-tailscale`.

---

- Upgrading terraform-provider-tailscale from 0.13.12  to 0.13.13.
	Fixes #280
  • Loading branch information
iwahbe committed Dec 15, 2023
2 parents 04a80dc + 177eed0 commit 5576a77
Show file tree
Hide file tree
Showing 21 changed files with 921 additions and 107 deletions.
160 changes: 160 additions & 0 deletions provider/cmd/pulumi-resource-tailscale/bridge-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
{
"auto-aliasing": {
"resources": {
"tailscale_acl": {
"current": "tailscale:index/acl:Acl"
},
"tailscale_device_authorization": {
"current": "tailscale:index/deviceAuthorization:DeviceAuthorization"
},
"tailscale_device_key": {
"current": "tailscale:index/deviceKey:DeviceKey"
},
"tailscale_device_subnet_routes": {
"current": "tailscale:index/deviceSubnetRoutes:DeviceSubnetRoutes",
"fields": {
"routes": {
"maxItemsOne": false
}
}
},
"tailscale_device_tags": {
"current": "tailscale:index/deviceTags:DeviceTags",
"fields": {
"tags": {
"maxItemsOne": false
}
}
},
"tailscale_dns_nameservers": {
"current": "tailscale:index/dnsNameservers:DnsNameservers",
"fields": {
"nameservers": {
"maxItemsOne": false
}
}
},
"tailscale_dns_preferences": {
"current": "tailscale:index/dnsPreferences:DnsPreferences"
},
"tailscale_dns_search_paths": {
"current": "tailscale:index/dnsSearchPaths:DnsSearchPaths",
"fields": {
"search_paths": {
"maxItemsOne": false
}
}
},
"tailscale_tailnet_key": {
"current": "tailscale:index/tailnetKey:TailnetKey",
"fields": {
"tags": {
"maxItemsOne": false
}
}
}
},
"datasources": {
"tailscale_4via6": {
"current": "tailscale:index/get4Via6:get4Via6"
},
"tailscale_acl": {
"current": "tailscale:index/getAcl:getAcl"
},
"tailscale_device": {
"current": "tailscale:index/getDevice:getDevice",
"fields": {
"addresses": {
"maxItemsOne": false
},
"tags": {
"maxItemsOne": false
}
}
},
"tailscale_devices": {
"current": "tailscale:index/getDevices:getDevices",
"fields": {
"devices": {
"maxItemsOne": false,
"elem": {
"fields": {
"addresses": {
"maxItemsOne": false
},
"tags": {
"maxItemsOne": false
}
}
}
}
}
}
}
},
"renames": {
"resources": {
"tailscale:index/acl:Acl": "tailscale_acl",
"tailscale:index/deviceAuthorization:DeviceAuthorization": "tailscale_device_authorization",
"tailscale:index/deviceKey:DeviceKey": "tailscale_device_key",
"tailscale:index/deviceSubnetRoutes:DeviceSubnetRoutes": "tailscale_device_subnet_routes",
"tailscale:index/deviceTags:DeviceTags": "tailscale_device_tags",
"tailscale:index/dnsNameservers:DnsNameservers": "tailscale_dns_nameservers",
"tailscale:index/dnsPreferences:DnsPreferences": "tailscale_dns_preferences",
"tailscale:index/dnsSearchPaths:DnsSearchPaths": "tailscale_dns_search_paths",
"tailscale:index/tailnetKey:TailnetKey": "tailscale_tailnet_key"
},
"functions": {
"tailscale:index/get4Via6:get4Via6": "tailscale_4via6",
"tailscale:index/getAcl:getAcl": "tailscale_acl",
"tailscale:index/getDevice:getDevice": "tailscale_device",
"tailscale:index/getDevices:getDevices": "tailscale_devices"
},
"renamedProperties": {
"tailscale:index/deviceAuthorization:DeviceAuthorization": {
"deviceId": "device_id"
},
"tailscale:index/deviceKey:DeviceKey": {
"deviceId": "device_id",
"keyExpiryDisabled": "key_expiry_disabled"
},
"tailscale:index/deviceSubnetRoutes:DeviceSubnetRoutes": {
"deviceId": "device_id"
},
"tailscale:index/deviceTags:DeviceTags": {
"deviceId": "device_id"
},
"tailscale:index/dnsPreferences:DnsPreferences": {
"magicDns": "magic_dns"
},
"tailscale:index/dnsSearchPaths:DnsSearchPaths": {
"searchPaths": "search_paths"
},
"tailscale:index/getDevice:getDevice": {
"waitFor": "wait_for"
},
"tailscale:index/getDevices:getDevices": {
"namePrefix": "name_prefix"
},
"tailscale:index/tailnetKey:TailnetKey": {
"createdAt": "created_at",
"expiresAt": "expires_at",
"recreateIfInvalid": "recreate_if_invalid"
},
"tailscale:index:Provider": {
"apiKey": "api_key",
"baseUrl": "base_url",
"oauthClientId": "oauth_client_id",
"oauthClientSecret": "oauth_client_secret",
"userAgent": "user_agent"
}
},
"renamedConfigProperties": {
"apiKey": "api_key",
"baseUrl": "base_url",
"oauthClientId": "oauth_client_id",
"oauthClientSecret": "oauth_client_secret",
"userAgent": "user_agent"
}
}
}
42 changes: 42 additions & 0 deletions provider/cmd/pulumi-resource-tailscale/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,10 @@
"type": "integer",
"description": "The expiry of the key in seconds. Defaults to `7776000` (90 days).\n"
},
"invalid": {
"type": "boolean",
"description": "Indicates whether the key is invalid (e.g. expired, revoked or has been deleted).\n"
},
"key": {
"type": "string",
"description": "The authentication key\n",
Expand All @@ -585,6 +589,10 @@
"type": "boolean",
"description": "Determines whether or not the machines authenticated by the key will be authorized for the tailnet by default. Defaults to `false`.\n"
},
"recreateIfInvalid": {
"type": "string",
"description": "Determines whether the key should be created again if it becomes invalid. By default, reusable keys will be recreated, but single-use keys will not. Possible values: 'always', 'never'.\n"
},
"reusable": {
"type": "boolean",
"description": "Indicates if the key is reusable or single-use. Defaults to `false`.\n"
Expand All @@ -600,6 +608,7 @@
"required": [
"createdAt",
"expiresAt",
"invalid",
"key"
],
"inputProperties": {
Expand All @@ -623,6 +632,10 @@
"description": "Determines whether or not the machines authenticated by the key will be authorized for the tailnet by default. Defaults to `false`.\n",
"willReplaceOnChanges": true
},
"recreateIfInvalid": {
"type": "string",
"description": "Determines whether the key should be created again if it becomes invalid. By default, reusable keys will be recreated, but single-use keys will not. Possible values: 'always', 'never'.\n"
},
"reusable": {
"type": "boolean",
"description": "Indicates if the key is reusable or single-use. Defaults to `false`.\n",
Expand Down Expand Up @@ -663,6 +676,10 @@
"description": "The expiry of the key in seconds. Defaults to `7776000` (90 days).\n",
"willReplaceOnChanges": true
},
"invalid": {
"type": "boolean",
"description": "Indicates whether the key is invalid (e.g. expired, revoked or has been deleted).\n"
},
"key": {
"type": "string",
"description": "The authentication key\n",
Expand All @@ -673,6 +690,10 @@
"description": "Determines whether or not the machines authenticated by the key will be authorized for the tailnet by default. Defaults to `false`.\n",
"willReplaceOnChanges": true
},
"recreateIfInvalid": {
"type": "string",
"description": "Determines whether the key should be created again if it becomes invalid. By default, reusable keys will be recreated, but single-use keys will not. Possible values: 'always', 'never'.\n"
},
"reusable": {
"type": "boolean",
"description": "Indicates if the key is reusable or single-use. Defaults to `false`.\n",
Expand Down Expand Up @@ -741,6 +762,27 @@
]
}
},
"tailscale:index/getAcl:getAcl": {
"description": "The acl data source gets the Tailscale ACL for a tailnet\n",
"outputs": {
"description": "A collection of values returned by getAcl.\n",
"properties": {
"id": {
"type": "string",
"description": "The provider-assigned unique ID for this managed resource.\n"
},
"json": {
"type": "string",
"description": "The contents of Tailscale ACL as JSON\n"
}
},
"type": "object",
"required": [
"json",
"id"
]
}
},
"tailscale:index/getDevice:getDevice": {
"description": "The device data source describes a single device in a tailnet\n\n{{% examples %}}\n## Example Usage\n{{% example %}}\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as tailscale from \"@pulumi/tailscale\";\n\nconst sampleDevice = tailscale.getDevice({\n name: \"user1-device.example.com\",\n waitFor: \"60s\",\n});\n```\n```python\nimport pulumi\nimport pulumi_tailscale as tailscale\n\nsample_device = tailscale.get_device(name=\"user1-device.example.com\",\n wait_for=\"60s\")\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Tailscale = Pulumi.Tailscale;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var sampleDevice = Tailscale.GetDevice.Invoke(new()\n {\n Name = \"user1-device.example.com\",\n WaitFor = \"60s\",\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-tailscale/sdk/go/tailscale\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t_, err := tailscale.GetDevice(ctx, \u0026tailscale.GetDeviceArgs{\n\t\t\tName: \"user1-device.example.com\",\n\t\t\tWaitFor: pulumi.StringRef(\"60s\"),\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.tailscale.TailscaleFunctions;\nimport com.pulumi.tailscale.inputs.GetDeviceArgs;\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 final var sampleDevice = TailscaleFunctions.getDevice(GetDeviceArgs.builder()\n .name(\"user1-device.example.com\")\n .waitFor(\"60s\")\n .build());\n\n }\n}\n```\n```yaml\nvariables:\n sampleDevice:\n fn::invoke:\n Function: tailscale:getDevice\n Arguments:\n name: user1-device.example.com\n waitFor: 60s\n```\n{{% /example %}}\n{{% /examples %}}",
"inputs": {
Expand Down
26 changes: 13 additions & 13 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ go 1.21
replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230912190043-e6d96b3b8f7e

require (
github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.30.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.68.0
github.com/pulumi/pulumi/sdk/v3 v3.96.2
github.com/tailscale/terraform-provider-tailscale v0.13.12
github.com/tailscale/terraform-provider-tailscale v0.13.13
)

require (
Expand Down Expand Up @@ -121,7 +120,7 @@ require (
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.18.0 // indirect
github.com/hashicorp/hcl/v2 v2.19.1 // indirect
github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.19.0 // indirect
Expand Down Expand Up @@ -178,6 +177,7 @@ require (
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 // indirect
github.com/pulumi/pulumi-yaml v1.4.3 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.96.2 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.96.2 // indirect
github.com/pulumi/schema-tools v0.1.2 // indirect
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
Expand All @@ -197,7 +197,7 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
github.com/tailscale/tailscale-client-go v1.13.0 // indirect
github.com/tailscale/tailscale-client-go v1.15.0 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
Expand All @@ -210,24 +210,24 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zclconf/go-cty v1.14.0 // indirect
github.com/zclconf/go-cty v1.14.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
go4.org/netipx v0.0.0-20230824141953-6213f710f925 // indirect
gocloud.dev v0.27.0 // indirect
gocloud.dev/secrets/hashivault v0.27.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.14.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.15.0 // indirect
golang.org/x/tools v0.16.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
Expand All @@ -240,5 +240,5 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/frand v1.4.2 // indirect
tailscale.com v1.52.1 // indirect
tailscale.com v1.54.1 // indirect
)
Loading

0 comments on commit 5576a77

Please sign in to comment.