Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade terraform-provider-gitlab to v16.1.1 #316

Merged
merged 2 commits into from
Jul 18, 2023
Merged

Upgrade terraform-provider-gitlab to v16.1.1 #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99c8e4d
make tfgen
aq17 Jul 17, 2023
1556439
make build_sdks
aq17 Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions provider/cmd/pulumi-resource-gitlab/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15402,7 +15402,7 @@
},
"encoding": {
"type": "string",
"description": "The file content encoding.\n"
"description": "The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.\n"
},
"executeFilemode": {
"type": "boolean",
Expand Down Expand Up @@ -15448,7 +15448,6 @@
"commitMessage",
"content",
"contentSha256",
"encoding",
"fileName",
"filePath",
"lastCommitId",
Expand Down Expand Up @@ -15478,6 +15477,10 @@
"type": "string",
"description": "File content. If the content is not yet base64 encoded, it will be encoded automatically. No other encoding is currently supported, because of a [GitLab API bug](https://gitlab.com/gitlab-org/gitlab/-/issues/342430).\n"
},
"encoding": {
"type": "string",
"description": "The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.\n"
},
"executeFilemode": {
"type": "boolean",
"description": "Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.\n"
Expand Down Expand Up @@ -15546,7 +15549,7 @@
},
"encoding": {
"type": "string",
"description": "The file content encoding.\n"
"description": "The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.\n"
},
"executeFilemode": {
"type": "boolean",
Expand Down
10 changes: 5 additions & 5 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
replace (
github.com/hashicorp/go-getter v1.5.0 => github.com/hashicorp/go-getter v1.4.0
github.com/hashicorp/terraform-exec => github.com/hashicorp/terraform-exec v0.17.2
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230327102345-3fa930f86570
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230710100801-03a71d0fca3d
github.com/hashicorp/terraform-plugin-test => github.com/hashicorp/terraform-plugin-test v1.3.0
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
gitlab.com/gitlab-org/terraform-provider-gitlab => ../upstream
Expand Down Expand Up @@ -50,8 +50,8 @@ require (
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
github.com/acomagu/bufpipe v1.0.4 // 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 @@ -95,8 +95,8 @@ require (
github.com/fatih/color v1.13.0 // indirect
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.4.0 // indirect
github.com/go-git/go-git/v5 v5.6.0 // indirect
github.com/go-git/go-billy/v5 v5.4.1 // indirect
github.com/go-git/go-git/v5 v5.6.1 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
Expand Down
640 changes: 612 additions & 28 deletions provider/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions sdk/dotnet/RepositoryFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ public partial class RepositoryFile : global::Pulumi.CustomResource
public Output<string> ContentSha256 { get; private set; } = null!;

/// <summary>
/// The file content encoding.
/// The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
/// </summary>
[Output("encoding")]
public Output<string> Encoding { get; private set; } = null!;
public Output<string?> Encoding { get; private set; } = null!;

/// <summary>
/// Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
Expand Down Expand Up @@ -205,6 +205,12 @@ public sealed class RepositoryFileArgs : global::Pulumi.ResourceArgs
[Input("content", required: true)]
public Input<string> Content { get; set; } = null!;

/// <summary>
/// The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
/// </summary>
[Input("encoding")]
public Input<string>? Encoding { get; set; }

/// <summary>
/// Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
/// </summary>
Expand Down Expand Up @@ -292,7 +298,7 @@ public sealed class RepositoryFileState : global::Pulumi.ResourceArgs
public Input<string>? ContentSha256 { get; set; }

/// <summary>
/// The file content encoding.
/// The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
/// </summary>
[Input("encoding")]
public Input<string>? Encoding { get; set; }
Expand Down
18 changes: 11 additions & 7 deletions sdk/go/gitlab/repositoryFile.go
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions sdk/java/src/main/java/com/pulumi/gitlab/RepositoryFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,18 @@ public Output<String> contentSha256() {
return this.contentSha256;
}
/**
* The file content encoding.
* The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
*/
@Export(name="encoding", refs={String.class}, tree="[0]")
private Output<String> encoding;
private Output</* @Nullable */ String> encoding;

/**
* @return The file content encoding.
* @return The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
*/
public Output<String> encoding() {
return this.encoding;
public Output<Optional<String>> encoding() {
return Codegen.optional(this.encoding);
}
/**
* Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
Expand Down
37 changes: 37 additions & 0 deletions sdk/java/src/main/java/com/pulumi/gitlab/RepositoryFileArgs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,21 @@ public Output<String> content() {
return this.content;
}

/**
* The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
*/
@Import(name="encoding")
private @Nullable Output<String> encoding;

/**
* @return The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
*/
public Optional<Output<String>> encoding() {
return Optional.ofNullable(this.encoding);
}

/**
* Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
*
Expand Down Expand Up @@ -174,6 +189,7 @@ private RepositoryFileArgs(RepositoryFileArgs $) {
this.branch = $.branch;
this.commitMessage = $.commitMessage;
this.content = $.content;
this.encoding = $.encoding;
this.executeFilemode = $.executeFilemode;
this.filePath = $.filePath;
this.overwriteOnCreate = $.overwriteOnCreate;
Expand Down Expand Up @@ -304,6 +320,27 @@ public Builder content(String content) {
return content(Output.of(content));
}

/**
* @param encoding The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
* @return builder
*
*/
public Builder encoding(@Nullable Output<String> encoding) {
$.encoding = encoding;
return this;
}

/**
* @param encoding The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
* @return builder
*
*/
public Builder encoding(String encoding) {
return encoding(Output.of(encoding));
}

/**
* @param executeFilemode Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
*
Expand Down
8 changes: 4 additions & 4 deletions sdk/java/src/main/java/com/pulumi/gitlab/inputs/RepositoryFileState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ public Optional<Output<String>> contentSha256() {
}

/**
* The file content encoding.
* The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
*/
@Import(name="encoding")
private @Nullable Output<String> encoding;

/**
* @return The file content encoding.
* @return The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
*/
public Optional<Output<String>> encoding() {
Expand Down Expand Up @@ -497,7 +497,7 @@ public Builder contentSha256(String contentSha256) {
}

/**
* @param encoding The file content encoding.
* @param encoding The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
* @return builder
*
Expand All @@ -508,7 +508,7 @@ public Builder encoding(@Nullable Output<String> encoding) {
}

/**
* @param encoding The file content encoding.
* @param encoding The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*
* @return builder
*
Expand Down
12 changes: 8 additions & 4 deletions sdk/nodejs/repositoryFile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ export class RepositoryFile extends pulumi.CustomResource {
*/
public /*out*/ readonly contentSha256!: pulumi.Output<string>;
/**
* The file content encoding.
* The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*/
public /*out*/ readonly encoding!: pulumi.Output<string>;
public readonly encoding!: pulumi.Output<string | undefined>;
/**
* Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
*/
Expand Down Expand Up @@ -167,6 +167,7 @@ export class RepositoryFile extends pulumi.CustomResource {
resourceInputs["branch"] = args ? args.branch : undefined;
resourceInputs["commitMessage"] = args ? args.commitMessage : undefined;
resourceInputs["content"] = args ? args.content : undefined;
resourceInputs["encoding"] = args ? args.encoding : undefined;
resourceInputs["executeFilemode"] = args ? args.executeFilemode : undefined;
resourceInputs["filePath"] = args ? args.filePath : undefined;
resourceInputs["overwriteOnCreate"] = args ? args.overwriteOnCreate : undefined;
Expand All @@ -175,7 +176,6 @@ export class RepositoryFile extends pulumi.CustomResource {
resourceInputs["blobId"] = undefined /*out*/;
resourceInputs["commitId"] = undefined /*out*/;
resourceInputs["contentSha256"] = undefined /*out*/;
resourceInputs["encoding"] = undefined /*out*/;
resourceInputs["fileName"] = undefined /*out*/;
resourceInputs["lastCommitId"] = undefined /*out*/;
resourceInputs["ref"] = undefined /*out*/;
Expand Down Expand Up @@ -223,7 +223,7 @@ export interface RepositoryFileState {
*/
contentSha256?: pulumi.Input<string>;
/**
* The file content encoding.
* The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*/
encoding?: pulumi.Input<string>;
/**
Expand Down Expand Up @@ -288,6 +288,10 @@ export interface RepositoryFileArgs {
* File content. If the content is not yet base64 encoded, it will be encoded automatically. No other encoding is currently supported, because of a [GitLab API bug](https://gitlab.com/gitlab-org/gitlab/-/issues/342430).
*/
content: pulumi.Input<string>;
/**
* The file content encoding. Default value is `base64`. Valid values are: `base64`, `text`.
*/
encoding?: pulumi.Input<string>;
/**
* Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
*/
Expand Down
Loading