diff --git a/provider/cmd/pulumi-resource-github/schema.json b/provider/cmd/pulumi-resource-github/schema.json index a865df83..c87e5bd3 100644 --- a/provider/cmd/pulumi-resource-github/schema.json +++ b/provider/cmd/pulumi-resource-github/schema.json @@ -413,7 +413,8 @@ "description": "The permission of the outside collaborators for the repository.\nMust be one of `pull`, `triage`, `push`, `maintain`, `admin` or the name of an existing [custom repository role](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization) within the organisation. Defaults to `pull`.\nMust be `push` for personal repositories. Defaults to `push`.\n" }, "teamId": { - "type": "string" + "type": "string", + "description": "The GitHub team id or the GitHub team slug\n" } }, "type": "object", diff --git a/provider/go.mod b/provider/go.mod index 1e0a71a9..d1f11008 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/hashicorp/terraform-plugin-sdk v1.17.2 - github.com/integrations/terraform-provider-github/v5 v5.30.0 + github.com/integrations/terraform-provider-github/v5 v5.30.1 github.com/pulumi/pulumi-terraform-bridge/v3 v3.53.0 github.com/pulumi/pulumi/sdk/v3 v3.73.1-0.20230623071431-db579129f4c9 ) @@ -197,14 +197,14 @@ require ( go.uber.org/atomic v1.10.0 // indirect gocloud.dev v0.29.0 // indirect gocloud.dev/secrets/hashivault v0.29.0 // indirect - golang.org/x/crypto v0.10.0 // indirect + golang.org/x/crypto v0.11.0 // indirect golang.org/x/mod v0.10.0 // indirect golang.org/x/net v0.11.0 // indirect golang.org/x/oauth2 v0.9.0 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.9.0 // indirect - golang.org/x/term v0.9.0 // indirect - golang.org/x/text v0.10.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/term v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.8.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect diff --git a/provider/go.sum b/provider/go.sum index 430dd1dc..8732ea58 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -1511,8 +1511,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/integrations/terraform-provider-github/v5 v5.30.0 h1:9jgd1bQ9Sb/fMJAq5wIvOOHOMYgYTKoYu5OsO9YkkDU= -github.com/integrations/terraform-provider-github/v5 v5.30.0/go.mod h1:KVkSMEri8wSzEiCHyjCHDCVVjgprxUGfVmYAmr1vAhI= +github.com/integrations/terraform-provider-github/v5 v5.30.1 h1:9JnjCwVBW+UIN5/CKGooSw7qRR5iFNfY5+p2yMblSqg= +github.com/integrations/terraform-provider-github/v5 v5.30.1/go.mod h1:d1cEMg7GED//1i6UxOceaVAkiZ9mxbXU883g+Ekn58M= github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ= github.com/ionos-cloud/sdk-go/v6 v6.1.3/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= @@ -2387,8 +2387,8 @@ golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2749,8 +2749,8 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2764,8 +2764,8 @@ golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= -golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2781,8 +2781,8 @@ golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/provider/resources.go b/provider/resources.go index 9efdf6d3..5254a594 100644 --- a/provider/resources.go +++ b/provider/resources.go @@ -25,10 +25,9 @@ import ( "github.com/integrations/terraform-provider-github/v5/github" "github.com/pulumi/pulumi-github/provider/v5/pkg/version" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/x" + tfbridgetokens "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens" shimv1 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v1" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" - "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" ) // all of the token components used below. @@ -252,15 +251,9 @@ func Provider() tfbridge.ProviderInfo { }, MetadataInfo: tfbridge.NewProviderMetadata(metadata), } - err := x.ComputeDefaults(&prov, x.TokensSingleModule("github_", mainMod, - x.MakeStandardToken(mainPkg))) - contract.AssertNoErrorf(err, "auto token mapping failed") - err = - - // Since SetAutonaming mutates the set of resources in prov.Resources, it must be - // called after defaults have been computed. - x.AutoAliasing(&prov, prov.GetMetadata()) - contract.AssertNoErrorf(err, "auto aliasing apply failed") + prov.MustComputeTokens(tfbridgetokens.SingleModule("github_", mainMod, + tfbridgetokens.MakeStandard(mainPkg))) + prov.MustApplyAutoAliases() prov.SetAutonaming(255, "-") diff --git a/sdk/dotnet/Inputs/RepositoryCollaboratorsTeamArgs.cs b/sdk/dotnet/Inputs/RepositoryCollaboratorsTeamArgs.cs index 81a9b6fe..d90a2ab9 100644 --- a/sdk/dotnet/Inputs/RepositoryCollaboratorsTeamArgs.cs +++ b/sdk/dotnet/Inputs/RepositoryCollaboratorsTeamArgs.cs @@ -20,6 +20,9 @@ public sealed class RepositoryCollaboratorsTeamArgs : global::Pulumi.ResourceArg [Input("permission")] public Input? Permission { get; set; } + /// + /// The GitHub team id or the GitHub team slug + /// [Input("teamId", required: true)] public Input TeamId { get; set; } = null!; diff --git a/sdk/dotnet/Inputs/RepositoryCollaboratorsTeamGetArgs.cs b/sdk/dotnet/Inputs/RepositoryCollaboratorsTeamGetArgs.cs index 632317e3..4602c81b 100644 --- a/sdk/dotnet/Inputs/RepositoryCollaboratorsTeamGetArgs.cs +++ b/sdk/dotnet/Inputs/RepositoryCollaboratorsTeamGetArgs.cs @@ -20,6 +20,9 @@ public sealed class RepositoryCollaboratorsTeamGetArgs : global::Pulumi.Resource [Input("permission")] public Input? Permission { get; set; } + /// + /// The GitHub team id or the GitHub team slug + /// [Input("teamId", required: true)] public Input TeamId { get; set; } = null!; diff --git a/sdk/dotnet/Outputs/RepositoryCollaboratorsTeam.cs b/sdk/dotnet/Outputs/RepositoryCollaboratorsTeam.cs index 778fbabc..9d07754c 100644 --- a/sdk/dotnet/Outputs/RepositoryCollaboratorsTeam.cs +++ b/sdk/dotnet/Outputs/RepositoryCollaboratorsTeam.cs @@ -19,6 +19,9 @@ public sealed class RepositoryCollaboratorsTeam /// Must be `push` for personal repositories. Defaults to `push`. /// public readonly string? Permission; + /// + /// The GitHub team id or the GitHub team slug + /// public readonly string TeamId; [OutputConstructor] diff --git a/sdk/go/github/pulumiTypes.go b/sdk/go/github/pulumiTypes.go index 5009cd7e..4f14a461 100644 --- a/sdk/go/github/pulumiTypes.go +++ b/sdk/go/github/pulumiTypes.go @@ -1934,7 +1934,8 @@ type RepositoryCollaboratorsTeam struct { // Must be one of `pull`, `triage`, `push`, `maintain`, `admin` or the name of an existing [custom repository role](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization) within the organisation. Defaults to `pull`. // Must be `push` for personal repositories. Defaults to `push`. Permission *string `pulumi:"permission"` - TeamId string `pulumi:"teamId"` + // The GitHub team id or the GitHub team slug + TeamId string `pulumi:"teamId"` } // RepositoryCollaboratorsTeamInput is an input type that accepts RepositoryCollaboratorsTeamArgs and RepositoryCollaboratorsTeamOutput values. @@ -1953,7 +1954,8 @@ type RepositoryCollaboratorsTeamArgs struct { // Must be one of `pull`, `triage`, `push`, `maintain`, `admin` or the name of an existing [custom repository role](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization) within the organisation. Defaults to `pull`. // Must be `push` for personal repositories. Defaults to `push`. Permission pulumi.StringPtrInput `pulumi:"permission"` - TeamId pulumi.StringInput `pulumi:"teamId"` + // The GitHub team id or the GitHub team slug + TeamId pulumi.StringInput `pulumi:"teamId"` } func (RepositoryCollaboratorsTeamArgs) ElementType() reflect.Type { @@ -2014,6 +2016,7 @@ func (o RepositoryCollaboratorsTeamOutput) Permission() pulumi.StringPtrOutput { return o.ApplyT(func(v RepositoryCollaboratorsTeam) *string { return v.Permission }).(pulumi.StringPtrOutput) } +// The GitHub team id or the GitHub team slug func (o RepositoryCollaboratorsTeamOutput) TeamId() pulumi.StringOutput { return o.ApplyT(func(v RepositoryCollaboratorsTeam) string { return v.TeamId }).(pulumi.StringOutput) } diff --git a/sdk/java/src/main/java/com/pulumi/github/inputs/RepositoryCollaboratorsTeamArgs.java b/sdk/java/src/main/java/com/pulumi/github/inputs/RepositoryCollaboratorsTeamArgs.java index 25ad68d7..57b6569e 100644 --- a/sdk/java/src/main/java/com/pulumi/github/inputs/RepositoryCollaboratorsTeamArgs.java +++ b/sdk/java/src/main/java/com/pulumi/github/inputs/RepositoryCollaboratorsTeamArgs.java @@ -34,9 +34,17 @@ public Optional> permission() { return Optional.ofNullable(this.permission); } + /** + * The GitHub team id or the GitHub team slug + * + */ @Import(name="teamId", required=true) private Output teamId; + /** + * @return The GitHub team id or the GitHub team slug + * + */ public Output teamId() { return this.teamId; } @@ -91,11 +99,23 @@ public Builder permission(String permission) { return permission(Output.of(permission)); } + /** + * @param teamId The GitHub team id or the GitHub team slug + * + * @return builder + * + */ public Builder teamId(Output teamId) { $.teamId = teamId; return this; } + /** + * @param teamId The GitHub team id or the GitHub team slug + * + * @return builder + * + */ public Builder teamId(String teamId) { return teamId(Output.of(teamId)); } diff --git a/sdk/java/src/main/java/com/pulumi/github/outputs/RepositoryCollaboratorsTeam.java b/sdk/java/src/main/java/com/pulumi/github/outputs/RepositoryCollaboratorsTeam.java index 08601e90..98fb2449 100644 --- a/sdk/java/src/main/java/com/pulumi/github/outputs/RepositoryCollaboratorsTeam.java +++ b/sdk/java/src/main/java/com/pulumi/github/outputs/RepositoryCollaboratorsTeam.java @@ -18,6 +18,10 @@ public final class RepositoryCollaboratorsTeam { * */ private @Nullable String permission; + /** + * @return The GitHub team id or the GitHub team slug + * + */ private String teamId; private RepositoryCollaboratorsTeam() {} @@ -30,6 +34,10 @@ private RepositoryCollaboratorsTeam() {} public Optional permission() { return Optional.ofNullable(this.permission); } + /** + * @return The GitHub team id or the GitHub team slug + * + */ public String teamId() { return this.teamId; } diff --git a/sdk/nodejs/types/input.ts b/sdk/nodejs/types/input.ts index 51d0c74e..6c293491 100644 --- a/sdk/nodejs/types/input.ts +++ b/sdk/nodejs/types/input.ts @@ -194,6 +194,9 @@ export interface RepositoryCollaboratorsTeam { * Must be `push` for personal repositories. Defaults to `push`. */ permission?: pulumi.Input; + /** + * The GitHub team id or the GitHub team slug + */ teamId: pulumi.Input; } diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts index 89178456..ca08eb6e 100644 --- a/sdk/nodejs/types/output.ts +++ b/sdk/nodejs/types/output.ts @@ -848,6 +848,9 @@ export interface RepositoryCollaboratorsTeam { * Must be `push` for personal repositories. Defaults to `push`. */ permission?: string; + /** + * The GitHub team id or the GitHub team slug + */ teamId: string; } diff --git a/sdk/python/pulumi_github/_inputs.py b/sdk/python/pulumi_github/_inputs.py index 7e1f8b75..c6eaeee7 100644 --- a/sdk/python/pulumi_github/_inputs.py +++ b/sdk/python/pulumi_github/_inputs.py @@ -748,6 +748,7 @@ def __init__(__self__, *, team_id: pulumi.Input[str], permission: Optional[pulumi.Input[str]] = None): """ + :param pulumi.Input[str] team_id: The GitHub team id or the GitHub team slug :param pulumi.Input[str] permission: The permission of the outside collaborators for the repository. Must be one of `pull`, `triage`, `push`, `maintain`, `admin` or the name of an existing [custom repository role](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization) within the organisation. Defaults to `pull`. Must be `push` for personal repositories. Defaults to `push`. @@ -759,6 +760,9 @@ def __init__(__self__, *, @property @pulumi.getter(name="teamId") def team_id(self) -> pulumi.Input[str]: + """ + The GitHub team id or the GitHub team slug + """ return pulumi.get(self, "team_id") @team_id.setter diff --git a/sdk/python/pulumi_github/outputs.py b/sdk/python/pulumi_github/outputs.py index d6ab9efe..d3c06602 100644 --- a/sdk/python/pulumi_github/outputs.py +++ b/sdk/python/pulumi_github/outputs.py @@ -756,6 +756,7 @@ def __init__(__self__, *, team_id: str, permission: Optional[str] = None): """ + :param str team_id: The GitHub team id or the GitHub team slug :param str permission: The permission of the outside collaborators for the repository. Must be one of `pull`, `triage`, `push`, `maintain`, `admin` or the name of an existing [custom repository role](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization) within the organisation. Defaults to `pull`. Must be `push` for personal repositories. Defaults to `push`. @@ -767,6 +768,9 @@ def __init__(__self__, *, @property @pulumi.getter(name="teamId") def team_id(self) -> str: + """ + The GitHub team id or the GitHub team slug + """ return pulumi.get(self, "team_id") @property