Skip to content

Commit

Permalink
Upgrade terraform-provider-tailscale to v0.16.1 (#414)
Browse files Browse the repository at this point in the history 
This PR was generated via `$ upgrade-provider pulumi/pulumi-tailscale
--kind=all --target-bridge-version=latest`.

---

- Upgrading terraform-provider-tailscale from 0.15.0  to 0.16.1.
	Fixes #413
	Fixes #407

---------

Co-authored-by: Ian Wahbe <ian@wahbe.com>
  • Loading branch information
@pulumi-bot @iwahbe
pulumi-bot and iwahbe committed May 6, 2024
1 parent 8897bc6 commit 3124061
Show file tree
Hide file tree
Showing 23 changed files with 1,359 additions and 70 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: actions/setup-go@v5
with:
# The versions of golangci-lint and setup-go here cross-depend and need to update together.
go-version: 1.21
go-version: 1.22
# Either this action or golangci-lint needs to disable the cache
cache: false
- name: disarm go:embed directives to enable lint
Expand All @@ -61,7 +61,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v4
with:
version: v1.55.2
version: v1.58.0
working-directory: provider
- if: failure() && github.event_name == 'push'
name: Notify Slack
Expand Down
8 changes: 8 additions & 0 deletions provider/cmd/pulumi-resource-tailscale/bridge-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@
}
}
},
"tailscale_dns_split_nameservers": {
"current": "tailscale:index/dnsSplitNameservers:DnsSplitNameservers",
"fields": {
"nameservers": {
"maxItemsOne": false
}
}
},
"tailscale_tailnet_key": {
"current": "tailscale:index/tailnetKey:TailnetKey",
"fields": {
Expand Down
58 changes: 56 additions & 2 deletions provider/cmd/pulumi-resource-tailscale/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,60 @@
"type": "object"
}
},
"tailscale:index/dnsSplitNameservers:DnsSplitNameservers": {
"description": "The dns_split_nameservers resource allows you to configure split DNS nameservers for your Tailscale network. See https://tailscale.com/kb/1054/dns for more information.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as tailscale from \"@pulumi/tailscale\";\n\nconst sampleSplitNameservers = new tailscale.DnsSplitNameservers(\"sample_split_nameservers\", {\n domain: \"foo.example.com\",\n nameservers: [\"1.1.1.1\"],\n});\n```\n```python\nimport pulumi\nimport pulumi_tailscale as tailscale\n\nsample_split_nameservers = tailscale.DnsSplitNameservers(\"sample_split_nameservers\",\n domain=\"foo.example.com\",\n nameservers=[\"1.1.1.1\"])\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 sampleSplitNameservers = new Tailscale.DnsSplitNameservers(\"sample_split_nameservers\", new()\n {\n Domain = \"foo.example.com\",\n Nameservers = new[]\n {\n \"1.1.1.1\",\n },\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.NewDnsSplitNameservers(ctx, \"sample_split_nameservers\", \u0026tailscale.DnsSplitNameserversArgs{\n\t\t\tDomain: pulumi.String(\"foo.example.com\"),\n\t\t\tNameservers: pulumi.StringArray{\n\t\t\t\tpulumi.String(\"1.1.1.1\"),\n\t\t\t},\n\t\t})\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.DnsSplitNameservers;\nimport com.pulumi.tailscale.DnsSplitNameserversArgs;\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 sampleSplitNameservers = new DnsSplitNameservers(\"sampleSplitNameservers\", DnsSplitNameserversArgs.builder() \n .domain(\"foo.example.com\")\n .nameservers(\"1.1.1.1\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n sampleSplitNameservers:\n type: tailscale:DnsSplitNameservers\n name: sample_split_nameservers\n properties:\n domain: foo.example.com\n nameservers:\n - 1.1.1.1\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\nSplit DNS nameservers can be imported using the domain name, e.g.\n\n```sh\n$ pulumi import tailscale:index/dnsSplitNameservers:DnsSplitNameservers sample_split_nameservers example.com\n```\n\n",
"properties": {
"domain": {
"type": "string",
"description": "Domain to configure split DNS for. Requests for this domain will be resolved using the provided nameservers.\n"
},
"nameservers": {
"type": "array",
"items": {
"type": "string"
},
"description": "Devices on your network will use these nameservers to resolve DNS names. IPv4 or IPv6 addresses are accepted.\n"
}
},
"required": [
"domain",
"nameservers"
],
"inputProperties": {
"domain": {
"type": "string",
"description": "Domain to configure split DNS for. Requests for this domain will be resolved using the provided nameservers.\n"
},
"nameservers": {
"type": "array",
"items": {
"type": "string"
},
"description": "Devices on your network will use these nameservers to resolve DNS names. IPv4 or IPv6 addresses are accepted.\n"
}
},
"requiredInputs": [
"domain",
"nameservers"
],
"stateInputs": {
"description": "Input properties used for looking up and filtering DnsSplitNameservers resources.\n",
"properties": {
"domain": {
"type": "string",
"description": "Domain to configure split DNS for. Requests for this domain will be resolved using the provided nameservers.\n"
},
"nameservers": {
"type": "array",
"items": {
"type": "string"
},
"description": "Devices on your network will use these nameservers to resolve DNS names. IPv4 or IPv6 addresses are accepted.\n"
}
},
"type": "object"
}
},
"tailscale:index/tailnetKey:TailnetKey": {
"description": "The tailnet_key resource allows you to create pre-authentication keys that can register new nodes without needing to sign in via a web browser. See https://tailscale.com/kb/1085/auth-keys for more information\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as tailscale from \"@pulumi/tailscale\";\n\nconst sampleKey = new tailscale.TailnetKey(\"sample_key\", {\n reusable: true,\n ephemeral: false,\n preauthorized: true,\n expiry: 3600,\n description: \"Sample key\",\n});\n```\n```python\nimport pulumi\nimport pulumi_tailscale as tailscale\n\nsample_key = tailscale.TailnetKey(\"sample_key\",\n reusable=True,\n ephemeral=False,\n preauthorized=True,\n expiry=3600,\n description=\"Sample key\")\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 sampleKey = new Tailscale.TailnetKey(\"sample_key\", new()\n {\n Reusable = true,\n Ephemeral = false,\n Preauthorized = true,\n Expiry = 3600,\n Description = \"Sample key\",\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.NewTailnetKey(ctx, \"sample_key\", \u0026tailscale.TailnetKeyArgs{\n\t\t\tReusable: pulumi.Bool(true),\n\t\t\tEphemeral: pulumi.Bool(false),\n\t\t\tPreauthorized: pulumi.Bool(true),\n\t\t\tExpiry: pulumi.Int(3600),\n\t\t\tDescription: pulumi.String(\"Sample key\"),\n\t\t})\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.TailnetKey;\nimport com.pulumi.tailscale.TailnetKeyArgs;\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 sampleKey = new TailnetKey(\"sampleKey\", TailnetKeyArgs.builder() \n .reusable(true)\n .ephemeral(false)\n .preauthorized(true)\n .expiry(3600)\n .description(\"Sample key\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n sampleKey:\n type: tailscale:TailnetKey\n name: sample_key\n properties:\n reusable: true\n ephemeral: false\n preauthorized: true\n expiry: 3600\n description: Sample key\n```\n\u003c!--End PulumiCodeChooser --\u003e\n",
"properties": {
Expand Down Expand Up @@ -746,7 +800,7 @@
},
"site": {
"type": "integer",
"description": "Site ID (between 0 and 255)\n"
"description": "Site ID (between 0 and 65535)\n"
}
},
"type": "object",
Expand All @@ -771,7 +825,7 @@
"type": "string"
},
"site": {
"description": "Site ID (between 0 and 255)\n",
"description": "Site ID (between 0 and 65535)\n",
"type": "integer"
}
},
Expand Down
32 changes: 16 additions & 16 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/pulumi/pulumi-terraform-bridge/v3 v3.81.0
github.com/pulumi/pulumi/sdk/v3 v3.113.0
github.com/stretchr/testify v1.9.0
github.com/tailscale/terraform-provider-tailscale v0.15.0
github.com/tailscale/terraform-provider-tailscale v0.16.1
)

require (
Expand All @@ -35,7 +35,7 @@ require (
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-cidr v1.1.0 // indirect
Expand Down Expand Up @@ -82,7 +82,7 @@ require (
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/go-git/go-git/v5 v5.12.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
Expand Down Expand Up @@ -191,15 +191,15 @@ require (
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
github.com/segmentio/asm v1.1.3 // indirect
github.com/segmentio/encoding v0.3.5 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
github.com/tailscale/tailscale-client-go v1.16.0 // indirect
github.com/tailscale/tailscale-client-go v1.17.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 @@ -212,7 +212,7 @@ 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.2 // indirect
github.com/zclconf/go-cty v1.14.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
Expand All @@ -224,17 +224,17 @@ require (
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
gocloud.dev v0.37.0 // indirect
gocloud.dev/secrets/hashivault v0.27.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.18.0 // indirect
golang.org/x/tools v0.20.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.169.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
Expand All @@ -248,5 +248,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.60.1 // indirect
tailscale.com v1.64.2 // indirect
)
Loading

0 comments on commit 3124061

Please sign in to comment.