Skip to content

Commit

Permalink
Upgrade terraform-provider-github to v5.30.1 (#387)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pulumi-bot
pulumi-bot committed Jul 11, 2023
1 parent 9ef0368 commit 4c95f80
Show file tree
Hide file tree
Showing 14 changed files with 77 additions and 29 deletions.
3 changes: 2 additions & 1 deletion provider/cmd/pulumi-resource-github/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand All @@ -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=
Expand All @@ -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=
Expand Down
15 changes: 4 additions & 11 deletions provider/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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, "-")

Expand Down
3 changes: 3 additions & 0 deletions sdk/dotnet/Inputs/RepositoryCollaboratorsTeamArgs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ public sealed class RepositoryCollaboratorsTeamArgs : global::Pulumi.ResourceArg
[Input("permission")]
public Input<string>? Permission { get; set; }

/// <summary>
/// The GitHub team id or the GitHub team slug
/// </summary>
[Input("teamId", required: true)]
public Input<string> TeamId { get; set; } = null!;

Expand Down
3 changes: 3 additions & 0 deletions sdk/dotnet/Inputs/RepositoryCollaboratorsTeamGetArgs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ public sealed class RepositoryCollaboratorsTeamGetArgs : global::Pulumi.Resource
[Input("permission")]
public Input<string>? Permission { get; set; }

/// <summary>
/// The GitHub team id or the GitHub team slug
/// </summary>
[Input("teamId", required: true)]
public Input<string> TeamId { get; set; } = null!;

Expand Down
3 changes: 3 additions & 0 deletions sdk/dotnet/Outputs/RepositoryCollaboratorsTeam.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ public sealed class RepositoryCollaboratorsTeam
/// Must be `push` for personal repositories. Defaults to `push`.
/// </summary>
public readonly string? Permission;
/// <summary>
/// The GitHub team id or the GitHub team slug
/// </summary>
public readonly string TeamId;

[OutputConstructor]
Expand Down
7 changes: 5 additions & 2 deletions sdk/go/github/pulumiTypes.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions sdk/java/src/main/java/com/pulumi/github/inputs/RepositoryCollaboratorsTeamArgs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,17 @@ public Optional<Output<String>> permission() {
return Optional.ofNullable(this.permission);
}

/**
* The GitHub team id or the GitHub team slug
*
*/
@Import(name="teamId", required=true)
private Output<String> teamId;

/**
* @return The GitHub team id or the GitHub team slug
*
*/
public Output<String> teamId() {
return this.teamId;
}
Expand Down Expand Up @@ -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<String> 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));
}
Expand Down
8 changes: 8 additions & 0 deletions sdk/java/src/main/java/com/pulumi/github/outputs/RepositoryCollaboratorsTeam.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
Expand All @@ -30,6 +34,10 @@ private RepositoryCollaboratorsTeam() {}
public Optional<String> permission() {
return Optional.ofNullable(this.permission);
}
/**
* @return The GitHub team id or the GitHub team slug
*
*/
public String teamId() {
return this.teamId;
}
Expand Down
3 changes: 3 additions & 0 deletions sdk/nodejs/types/input.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ export interface RepositoryCollaboratorsTeam {
* Must be `push` for personal repositories. Defaults to `push`.
*/
permission?: pulumi.Input<string>;
/**
* The GitHub team id or the GitHub team slug
*/
teamId: pulumi.Input<string>;
}

Expand Down
3 changes: 3 additions & 0 deletions sdk/nodejs/types/output.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 4 additions & 0 deletions sdk/python/pulumi_github/_inputs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions sdk/python/pulumi_github/outputs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -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
Expand Down

0 comments on commit 4c95f80

Please sign in to comment.