Upgrade terraform-provider-port-labs to v1.1.1 (#38)

* make tfgen * make build_sdks
port-labs · Jul 22, 2023 · 7a22160 · 7a22160
1 parent e7a2b79
commit 7a22160
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -42,8 +42,8 @@ go get github.com/port-labs/pulumi-port/sdk
 
 The following configuration points are available for the `port` provider:
 
-- `port:clientId` - This is the Port client ID.
-- `port:secret` - This is the Port secret.
-- `port:baseUrl` (optional) - This is the Port base URL.
+- `port:clientId` - This is the Port client ID. (environment: PORT_CLIENT_ID)
+- `port:secret` - This is the Port secret. (environment: PORT_CLIENT_SECRET)
+- `port:baseUrl` (optional) - This is the Port base URL. (environment: PORT_BASE_URL)
 - `port:token` - (optional) This is the Port token.
 
diff --git a/docs/installation-configuration.md b/docs/installation-configuration.md
@@ -16,7 +16,7 @@ The Pulumi Port provider is available as a package in all Pulumi languages:
 
 The following configuration points are available for the `port` provider:
 
-- `port:clientId` - This is the Port client ID.
-- `port:secret` - This is the Port secret.
-- `port:baseUrl` (optional) - This is the Port base URL.
+- `port:clientId` - This is the Port client ID. (environment: PORT_CLIENT_ID)
+- `port:secret` - This is the Port secret. (environment: PORT_CLIENT_SECRET)
+- `port:baseUrl` (optional) - This is the Port base URL. (environment: PORT_BASE_URL)
 - `port:token` - (optional) This is the Port token.
diff --git a/provider/cmd/pulumi-resource-port/schema.json b/provider/cmd/pulumi-resource-port/schema.json
@@ -75,11 +75,7 @@
                 "description": "Token for Port-labs\n",
                 "secret": true
             }
-        },
-        "defaults": [
-            "clientId",
-            "secret"
-        ]
+        }
     },
     "types": {
         "port:index/ActionApprovalEmailNotification:ActionApprovalEmailNotification": {
@@ -1303,10 +1299,6 @@
                 "secret": true
             }
         },
-        "required": [
-            "clientId",
-            "secret"
-        ],
         "inputProperties": {
             "baseUrl": {
                 "type": "string"
@@ -1325,11 +1317,7 @@
                 "description": "Token for Port-labs\n",
                 "secret": true
             }
-        },
-        "requiredInputs": [
-            "clientId",
-            "secret"
-        ]
+        }
     },
     "resources": {
         "port:index/action:Action": {

diff --git a/provider/go.mod b/provider/go.mod
@@ -5,7 +5,7 @@ go 1.20
 replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230327102345-3fa930f86570
 
 require (
-	github.com/port-labs/terraform-provider-port-labs v1.1.0
+	github.com/port-labs/terraform-provider-port-labs v1.1.1
 	github.com/pulumi/pulumi-terraform-bridge/pf v0.13.0
 	github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.0
 	github.com/pulumi/pulumi/sdk/v3 v3.75.0

diff --git a/provider/go.sum b/provider/go.sum
@@ -1581,8 +1581,8 @@ github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk=
 github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/port-labs/terraform-provider-port-labs v1.1.0 h1:mi+UgGqZkfJLQCwcyYrK2veFe7ISV6TiU4vUAoyj7yY=
-github.com/port-labs/terraform-provider-port-labs v1.1.0/go.mod h1:pLn48/X30XZIrW3gvUM1rkVjAZkO7ZFjegc0x4hFdtc=
+github.com/port-labs/terraform-provider-port-labs v1.1.1 h1:g+u1mo8RcGPz70lkPZiTPbHM9kajVMiC8xDSMny6pOw=
+github.com/port-labs/terraform-provider-port-labs v1.1.1/go.mod h1:pLn48/X30XZIrW3gvUM1rkVjAZkO7ZFjegc0x4hFdtc=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=

diff --git a/sdk/go/port/provider.go b/sdk/go/port/provider.go
diff --git a/sdk/nodejs/provider.ts b/sdk/nodejs/provider.ts
@@ -29,11 +29,11 @@ export class Provider extends pulumi.ProviderResource {
     /**
      * Client ID for Port-labs
      */
-    public readonly clientId!: pulumi.Output<string>;
+    public readonly clientId!: pulumi.Output<string | undefined>;
     /**
      * Client Secret for Port-labs
      */
-    public readonly secret!: pulumi.Output<string>;
+    public readonly secret!: pulumi.Output<string | undefined>;
     /**
      * Token for Port-labs
      */
@@ -46,16 +46,10 @@ export class Provider extends pulumi.ProviderResource {
      * @param args The arguments to use to populate this resource's properties.
      * @param opts A bag of options that control this resource's behavior.
      */
-    constructor(name: string, args: ProviderArgs, opts?: pulumi.ResourceOptions) {
+    constructor(name: string, args?: ProviderArgs, opts?: pulumi.ResourceOptions) {
         let resourceInputs: pulumi.Inputs = {};
         opts = opts || {};
         {
-            if ((!args || args.clientId === undefined) && !opts.urn) {
-                throw new Error("Missing required property 'clientId'");
-            }
-            if ((!args || args.secret === undefined) && !opts.urn) {
-                throw new Error("Missing required property 'secret'");
-            }
             resourceInputs["baseUrl"] = args ? args.baseUrl : undefined;
             resourceInputs["clientId"] = args ? args.clientId : undefined;
             resourceInputs["secret"] = args?.secret ? pulumi.secret(args.secret) : undefined;
@@ -76,11 +70,11 @@ export interface ProviderArgs {
     /**
      * Client ID for Port-labs
      */
-    clientId: pulumi.Input<string>;
+    clientId?: pulumi.Input<string>;
     /**
      * Client Secret for Port-labs
      */
-    secret: pulumi.Input<string>;
+    secret?: pulumi.Input<string>;
     /**
      * Token for Port-labs
      */

diff --git a/sdk/python/README.md b/sdk/python/README.md
@@ -42,8 +42,8 @@ go get github.com/port-labs/pulumi-port/sdk
 
 The following configuration points are available for the `port` provider:
 
-- `port:clientId` - This is the Port client ID.
-- `port:secret` - This is the Port secret.
-- `port:baseUrl` (optional) - This is the Port base URL.
+- `port:clientId` - This is the Port client ID. (environment: PORT_CLIENT_ID)
+- `port:secret` - This is the Port secret. (environment: PORT_CLIENT_SECRET)
+- `port:baseUrl` (optional) - This is the Port base URL. (environment: PORT_BASE_URL)
 - `port:token` - (optional) This is the Port token.
 
diff --git a/sdk/python/port_pulumi/provider.py b/sdk/python/port_pulumi/provider.py
@@ -14,56 +14,58 @@
 @pulumi.input_type
 class ProviderArgs:
     def __init__(__self__, *,
-                 client_id: pulumi.Input[str],
-                 secret: pulumi.Input[str],
                  base_url: Optional[pulumi.Input[str]] = None,
+                 client_id: Optional[pulumi.Input[str]] = None,
+                 secret: Optional[pulumi.Input[str]] = None,
                  token: Optional[pulumi.Input[str]] = None):
         """
         The set of arguments for constructing a Provider resource.
         :param pulumi.Input[str] client_id: Client ID for Port-labs
         :param pulumi.Input[str] secret: Client Secret for Port-labs
         :param pulumi.Input[str] token: Token for Port-labs
         """
-        pulumi.set(__self__, "client_id", client_id)
-        pulumi.set(__self__, "secret", secret)
         if base_url is not None:
             pulumi.set(__self__, "base_url", base_url)
+        if client_id is not None:
+            pulumi.set(__self__, "client_id", client_id)
+        if secret is not None:
+            pulumi.set(__self__, "secret", secret)
         if token is not None:
             pulumi.set(__self__, "token", token)
 
+    @property
+    @pulumi.getter(name="baseUrl")
+    def base_url(self) -> Optional[pulumi.Input[str]]:
+        return pulumi.get(self, "base_url")
+
+    @base_url.setter
+    def base_url(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "base_url", value)
+
     @property
     @pulumi.getter(name="clientId")
-    def client_id(self) -> pulumi.Input[str]:
+    def client_id(self) -> Optional[pulumi.Input[str]]:
         """
         Client ID for Port-labs
         """
         return pulumi.get(self, "client_id")
 
     @client_id.setter
-    def client_id(self, value: pulumi.Input[str]):
+    def client_id(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "client_id", value)
 
     @property
     @pulumi.getter
-    def secret(self) -> pulumi.Input[str]:
+    def secret(self) -> Optional[pulumi.Input[str]]:
         """
         Client Secret for Port-labs
         """
         return pulumi.get(self, "secret")
 
     @secret.setter
-    def secret(self, value: pulumi.Input[str]):
+    def secret(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "secret", value)
 
-    @property
-    @pulumi.getter(name="baseUrl")
-    def base_url(self) -> Optional[pulumi.Input[str]]:
-        return pulumi.get(self, "base_url")
-
-    @base_url.setter
-    def base_url(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "base_url", value)
-
     @property
     @pulumi.getter
     def token(self) -> Optional[pulumi.Input[str]]:
@@ -103,7 +105,7 @@ def __init__(__self__,
     @overload
     def __init__(__self__,
                  resource_name: str,
-                 args: ProviderArgs,
+                 args: Optional[ProviderArgs] = None,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
         The provider type for the port package. By default, resources use package-wide configuration
@@ -140,11 +142,7 @@ def _internal_init(__self__,
             __props__ = ProviderArgs.__new__(ProviderArgs)
 
             __props__.__dict__["base_url"] = base_url
-            if client_id is None and not opts.urn:
-                raise TypeError("Missing required property 'client_id'")
             __props__.__dict__["client_id"] = client_id
-            if secret is None and not opts.urn:
-                raise TypeError("Missing required property 'secret'")
             __props__.__dict__["secret"] = None if secret is None else pulumi.Output.secret(secret)
             __props__.__dict__["token"] = None if token is None else pulumi.Output.secret(token)
         secret_opts = pulumi.ResourceOptions(additional_secret_outputs=["secret", "token"])
@@ -162,15 +160,15 @@ def base_url(self) -> pulumi.Output[Optional[str]]:
 
     @property
     @pulumi.getter(name="clientId")
-    def client_id(self) -> pulumi.Output[str]:
+    def client_id(self) -> pulumi.Output[Optional[str]]:
         """
         Client ID for Port-labs
         """
         return pulumi.get(self, "client_id")
 
     @property
     @pulumi.getter
-    def secret(self) -> pulumi.Output[str]:
+    def secret(self) -> pulumi.Output[Optional[str]]:
         """
         Client Secret for Port-labs
         """