Skip to content

Commit

Permalink
Merge pull request #184 from Twingate/upgrade-terraform-provider-twin…
Browse files Browse the repository at this point in the history 
…gate-to-v3.0.13

Upgrade terraform-provider-twingate to v3.0.13
  • Loading branch information
@twingate-blee
twingate-blee authored Dec 5, 2024
2 parents 400a6e0 + 314438b commit fb054ab
Show file tree
Hide file tree
Showing 17 changed files with 796 additions and 63 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 @@ -25,7 +25,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.23
# Either this action or golangci-lint needs to disable the cache
cache: false
- name: disarm go:embed directives to enable lint
Expand All @@ -39,5 +39,5 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.54.1
version: v1.62.2
working-directory: provider
2 changes: 1 addition & 1 deletion .pulumi-java-gen.version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.16.1
0.18.0
113 changes: 110 additions & 3 deletions provider/cmd/pulumi-resource-twingate/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,10 @@
},
"twingate:index/getTwingateConnectorsConnector:getTwingateConnectorsConnector": {
"properties": {
"hostname": {
"type": "string",
"description": "The hostname of the machine hosting the Connector.\n"
},
"id": {
"type": "string",
"description": "The ID of the Connector.\n"
Expand All @@ -388,21 +392,45 @@
"type": "string",
"description": "The Name of the Connector.\n"
},
"privateIps": {
"type": "array",
"items": {
"type": "string"
},
"description": "The Connector's private IP addresses.\n"
},
"publicIp": {
"type": "string",
"description": "The Connector's public IP address.\n"
},
"remoteNetworkId": {
"type": "string",
"description": "The ID of the Remote Network attached to the Connector.\n"
},
"state": {
"type": "string",
"description": "The Connector's state. One of `ALIVE`, `DEAD_NO_HEARTBEAT`, `DEAD_HEARTBEAT_TOO_OLD` or `DEAD_NO_RELAYS`.\n"
},
"statusUpdatesEnabled": {
"type": "boolean",
"description": "Determines whether status notifications are enabled for the Connector.\n"
},
"version": {
"type": "string",
"description": "The Connector's version.\n"
}
},
"type": "object",
"required": [
"hostname",
"id",
"name",
"privateIps",
"publicIp",
"remoteNetworkId",
"statusUpdatesEnabled"
"state",
"statusUpdatesEnabled",
"version"
],
"language": {
"nodejs": {
Expand Down Expand Up @@ -995,23 +1023,51 @@
"twingate:index/twingateConnector:TwingateConnector": {
"description": "Connectors provide connectivity to Remote Networks. This resource type will create the Connector in the Twingate Admin Console, but in order to successfully deploy it, you must also generate Connector tokens that authenticate the Connector with Twingate. For more information, see Twingate's [documentation](https://docs.twingate.com/docs/understanding-access-nodes).\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as twingate from \"@twingate/pulumi-twingate\";\n\nconst awsNetwork = new twingate.TwingateRemoteNetwork(\"awsNetwork\", {});\nconst awsConnector = new twingate.TwingateConnector(\"awsConnector\", {\n remoteNetworkId: awsNetwork.id,\n statusUpdatesEnabled: true,\n});\n```\n```python\nimport pulumi\nimport pulumi_twingate as twingate\n\naws_network = twingate.TwingateRemoteNetwork(\"awsNetwork\")\naws_connector = twingate.TwingateConnector(\"awsConnector\",\n remote_network_id=aws_network.id,\n status_updates_enabled=True)\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Twingate = Twingate.Twingate;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var awsNetwork = new Twingate.TwingateRemoteNetwork(\"awsNetwork\");\n\n var awsConnector = new Twingate.TwingateConnector(\"awsConnector\", new()\n {\n RemoteNetworkId = awsNetwork.Id,\n StatusUpdatesEnabled = true,\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/Twingate/pulumi-twingate/sdk/v3/go/twingate\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tawsNetwork, err := twingate.NewTwingateRemoteNetwork(ctx, \"awsNetwork\", nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = twingate.NewTwingateConnector(ctx, \"awsConnector\", \u0026twingate.TwingateConnectorArgs{\n\t\t\tRemoteNetworkId: awsNetwork.ID(),\n\t\t\tStatusUpdatesEnabled: pulumi.Bool(true),\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.twingate.TwingateRemoteNetwork;\nimport com.pulumi.twingate.TwingateConnector;\nimport com.pulumi.twingate.TwingateConnectorArgs;\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 awsNetwork = new TwingateRemoteNetwork(\"awsNetwork\");\n\n var awsConnector = new TwingateConnector(\"awsConnector\", TwingateConnectorArgs.builder()\n .remoteNetworkId(awsNetwork.id())\n .statusUpdatesEnabled(true)\n .build());\n\n }\n}\n```\n```yaml\nresources:\n awsNetwork:\n type: twingate:TwingateRemoteNetwork\n awsConnector:\n type: twingate:TwingateConnector\n properties:\n remoteNetworkId: ${awsNetwork.id}\n statusUpdatesEnabled: true\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\n```sh\n$ pulumi import twingate:index/twingateConnector:TwingateConnector aws_connector Q29ubmVjdG9yOjI2NzM=\n```\n\n",
"properties": {
"hostname": {
"type": "string",
"description": "The hostname of the machine hosting the Connector.\n"
},
"name": {
"type": "string",
"description": "Name of the Connector, if not provided one will be generated.\n"
},
"privateIps": {
"type": "array",
"items": {
"type": "string"
},
"description": "The Connector's private IP addresses.\n"
},
"publicIp": {
"type": "string",
"description": "The Connector's public IP address.\n"
},
"remoteNetworkId": {
"type": "string",
"description": "The ID of the Remote Network the Connector is attached to.\n"
},
"state": {
"type": "string",
"description": "The Connector's state. One of `ALIVE`, `DEAD_NO_HEARTBEAT`, `DEAD_HEARTBEAT_TOO_OLD` or `DEAD_NO_RELAYS`.\n"
},
"statusUpdatesEnabled": {
"type": "boolean",
"description": "Determines whether status notifications are enabled for the Connector. Default is `true`.\n"
},
"version": {
"type": "string",
"description": "The Connector's version.\n"
}
},
"required": [
"hostname",
"name",
"privateIps",
"publicIp",
"remoteNetworkId",
"statusUpdatesEnabled"
"state",
"statusUpdatesEnabled",
"version"
],
"inputProperties": {
"name": {
Expand All @@ -1033,17 +1089,40 @@
"stateInputs": {
"description": "Input properties used for looking up and filtering TwingateConnector resources.\n",
"properties": {
"hostname": {
"type": "string",
"description": "The hostname of the machine hosting the Connector.\n"
},
"name": {
"type": "string",
"description": "Name of the Connector, if not provided one will be generated.\n"
},
"privateIps": {
"type": "array",
"items": {
"type": "string"
},
"description": "The Connector's private IP addresses.\n"
},
"publicIp": {
"type": "string",
"description": "The Connector's public IP address.\n"
},
"remoteNetworkId": {
"type": "string",
"description": "The ID of the Remote Network the Connector is attached to.\n"
},
"state": {
"type": "string",
"description": "The Connector's state. One of `ALIVE`, `DEAD_NO_HEARTBEAT`, `DEAD_HEARTBEAT_TOO_OLD` or `DEAD_NO_RELAYS`.\n"
},
"statusUpdatesEnabled": {
"type": "boolean",
"description": "Determines whether status notifications are enabled for the Connector. Default is `true`.\n"
},
"version": {
"type": "string",
"description": "The Connector's version.\n"
}
},
"type": "object"
Expand Down Expand Up @@ -1790,6 +1869,10 @@
"outputs": {
"description": "A collection of values returned by getTwingateConnector.\n",
"properties": {
"hostname": {
"type": "string",
"description": "The hostname of the machine hosting the Connector.\n"
},
"id": {
"type": "string",
"description": "The ID of the Connector. The ID for the Connector can be obtained from the Admin API or the URL string in the Admin Console.\n"
Expand All @@ -1798,21 +1881,45 @@
"type": "string",
"description": "The name of the Connector.\n"
},
"privateIps": {
"type": "array",
"items": {
"type": "string"
},
"description": "The Connector's private IP addresses.\n"
},
"publicIp": {
"type": "string",
"description": "The Connector's public IP address.\n"
},
"remoteNetworkId": {
"type": "string",
"description": "The ID of the Remote Network the Connector is attached to.\n"
},
"state": {
"type": "string",
"description": "The Connector's state. One of `ALIVE`, `DEAD_NO_HEARTBEAT`, `DEAD_HEARTBEAT_TOO_OLD` or `DEAD_NO_RELAYS`.\n"
},
"statusUpdatesEnabled": {
"type": "boolean",
"description": "Determines whether status notifications are enabled for the Connector.\n"
},
"version": {
"type": "string",
"description": "The Connector's version.\n"
}
},
"type": "object",
"required": [
"hostname",
"id",
"name",
"privateIps",
"publicIp",
"remoteNetworkId",
"statusUpdatesEnabled"
"state",
"statusUpdatesEnabled",
"version"
]
}
},
Expand Down
32 changes: 16 additions & 16 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/Twingate/pulumi-twingate/provider

go 1.22.0
go 1.23

toolchain go1.22.5
toolchain go1.23.4

require (
github.com/Twingate/terraform-provider-twingate/v3 v3.0.12
github.com/pulumi/pulumi-terraform-bridge/pf v0.49.0
github.com/Twingate/terraform-provider-twingate/v3 v3.0.13
github.com/pulumi/pulumi-terraform-bridge/pf v0.48.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0
github.com/pulumi/pulumi/sdk/v3 v3.142.0
)
Expand Down Expand Up @@ -76,17 +76,17 @@ require (
github.com/hashicorp/go-getter v1.7.6 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.6.1 // indirect
github.com/hashicorp/go-plugin v1.6.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
github.com/hashicorp/terraform-plugin-framework v1.12.0 // indirect
github.com/hashicorp/terraform-plugin-framework-validators v0.14.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.24.0 // indirect
github.com/hashicorp/terraform-plugin-framework v1.13.0 // indirect
github.com/hashicorp/terraform-plugin-framework-validators v0.15.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.25.0 // indirect
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
Expand Down Expand Up @@ -140,7 +140,7 @@ require (
github.com/pulumi/pulumi/pkg/v3 v3.140.0 // indirect
github.com/pulumi/schema-tools v0.1.2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
Expand All @@ -161,7 +161,7 @@ require (
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/yuin/goldmark v1.7.4 // indirect
github.com/yuin/goldmark v1.7.7 // indirect
github.com/zclconf/go-cty v1.15.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
Expand All @@ -170,15 +170,15 @@ require (
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/term v0.26.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.25.0 // indirect
google.golang.org/api v0.198.0 // indirect
Expand Down
Loading

0 comments on commit fb054ab

Please sign in to comment.