diff --git a/provider/cmd/pulumi-resource-datadog/bridge-metadata.json b/provider/cmd/pulumi-resource-datadog/bridge-metadata.json index b48d937df..26fae10a9 100644 --- a/provider/cmd/pulumi-resource-datadog/bridge-metadata.json +++ b/provider/cmd/pulumi-resource-datadog/bridge-metadata.json @@ -16011,12 +16011,7 @@ }, "datadog_application_key": { "current": "datadog:index/getApplicationKey:getApplicationKey", - "majorVersion": 4, - "fields": { - "scopes": { - "maxItemsOne": false - } - } + "majorVersion": 4 }, "datadog_cloud_workload_security_agent_rules": { "current": "datadog:index/getCloudWorkloadSecurityAgentRules:getCloudWorkloadSecurityAgentRules", diff --git a/provider/cmd/pulumi-resource-datadog/schema.json b/provider/cmd/pulumi-resource-datadog/schema.json index 2123837c7..b4e36cbc0 100644 --- a/provider/cmd/pulumi-resource-datadog/schema.json +++ b/provider/cmd/pulumi-resource-datadog/schema.json @@ -41312,13 +41312,6 @@ "name": { "type": "string", "description": "Name for Application Key.\n" - }, - "scopes": { - "type": "array", - "items": { - "type": "string" - }, - "description": "Authorization scopes for the Application Key.\n" } }, "type": "object" @@ -41342,13 +41335,6 @@ "name": { "description": "Name for Application Key.\n", "type": "string" - }, - "scopes": { - "description": "Authorization scopes for the Application Key.\n", - "items": { - "type": "string" - }, - "type": "array" } }, "required": [ diff --git a/sdk/dotnet/GetApplicationKey.cs b/sdk/dotnet/GetApplicationKey.cs index 0727fab45..3dae3e621 100644 --- a/sdk/dotnet/GetApplicationKey.cs +++ b/sdk/dotnet/GetApplicationKey.cs @@ -105,18 +105,6 @@ public sealed class GetApplicationKeyArgs : global::Pulumi.InvokeArgs [Input("name")] public string? Name { get; set; } - [Input("scopes")] - private List? _scopes; - - /// - /// Authorization scopes for the Application Key. - /// - public List Scopes - { - get => _scopes ?? (_scopes = new List()); - set => _scopes = value; - } - public GetApplicationKeyArgs() { } @@ -143,18 +131,6 @@ public sealed class GetApplicationKeyInvokeArgs : global::Pulumi.InvokeArgs [Input("name")] public Input? Name { get; set; } - [Input("scopes")] - private InputList? _scopes; - - /// - /// Authorization scopes for the Application Key. - /// - public InputList Scopes - { - get => _scopes ?? (_scopes = new InputList()); - set => _scopes = value; - } - public GetApplicationKeyInvokeArgs() { } @@ -181,10 +157,6 @@ public sealed class GetApplicationKeyResult /// Name for Application Key. /// public readonly string? Name; - /// - /// Authorization scopes for the Application Key. - /// - public readonly ImmutableArray Scopes; [OutputConstructor] private GetApplicationKeyResult( @@ -194,15 +166,12 @@ private GetApplicationKeyResult( string key, - string? name, - - ImmutableArray scopes) + string? name) { ExactMatch = exactMatch; Id = id; Key = key; Name = name; - Scopes = scopes; } } } diff --git a/sdk/go/datadog/getApplicationKey.go b/sdk/go/datadog/getApplicationKey.go index 9d4698683..1364107ae 100644 --- a/sdk/go/datadog/getApplicationKey.go +++ b/sdk/go/datadog/getApplicationKey.go @@ -56,8 +56,6 @@ type LookupApplicationKeyArgs struct { Id *string `pulumi:"id"` // Name for Application Key. Name *string `pulumi:"name"` - // Authorization scopes for the Application Key. - Scopes []string `pulumi:"scopes"` } // A collection of values returned by getApplicationKey. @@ -70,8 +68,6 @@ type LookupApplicationKeyResult struct { Key string `pulumi:"key"` // Name for Application Key. Name *string `pulumi:"name"` - // Authorization scopes for the Application Key. - Scopes []string `pulumi:"scopes"` } func LookupApplicationKeyOutput(ctx *pulumi.Context, args LookupApplicationKeyOutputArgs, opts ...pulumi.InvokeOption) LookupApplicationKeyResultOutput { @@ -91,8 +87,6 @@ type LookupApplicationKeyOutputArgs struct { Id pulumi.StringPtrInput `pulumi:"id"` // Name for Application Key. Name pulumi.StringPtrInput `pulumi:"name"` - // Authorization scopes for the Application Key. - Scopes pulumi.StringArrayInput `pulumi:"scopes"` } func (LookupApplicationKeyOutputArgs) ElementType() reflect.Type { @@ -134,11 +128,6 @@ func (o LookupApplicationKeyResultOutput) Name() pulumi.StringPtrOutput { return o.ApplyT(func(v LookupApplicationKeyResult) *string { return v.Name }).(pulumi.StringPtrOutput) } -// Authorization scopes for the Application Key. -func (o LookupApplicationKeyResultOutput) Scopes() pulumi.StringArrayOutput { - return o.ApplyT(func(v LookupApplicationKeyResult) []string { return v.Scopes }).(pulumi.StringArrayOutput) -} - func init() { pulumi.RegisterOutputType(LookupApplicationKeyResultOutput{}) } diff --git a/sdk/java/src/main/java/com/pulumi/datadog/inputs/GetApplicationKeyArgs.java b/sdk/java/src/main/java/com/pulumi/datadog/inputs/GetApplicationKeyArgs.java index 74362a311..b4e74e697 100644 --- a/sdk/java/src/main/java/com/pulumi/datadog/inputs/GetApplicationKeyArgs.java +++ b/sdk/java/src/main/java/com/pulumi/datadog/inputs/GetApplicationKeyArgs.java @@ -7,7 +7,6 @@ import com.pulumi.core.annotations.Import; import java.lang.Boolean; import java.lang.String; -import java.util.List; import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; @@ -62,28 +61,12 @@ public Optional> name() { return Optional.ofNullable(this.name); } - /** - * Authorization scopes for the Application Key. - * - */ - @Import(name="scopes") - private @Nullable Output> scopes; - - /** - * @return Authorization scopes for the Application Key. - * - */ - public Optional>> scopes() { - return Optional.ofNullable(this.scopes); - } - private GetApplicationKeyArgs() {} private GetApplicationKeyArgs(GetApplicationKeyArgs $) { this.exactMatch = $.exactMatch; this.id = $.id; this.name = $.name; - this.scopes = $.scopes; } public static Builder builder() { @@ -167,37 +150,6 @@ public Builder name(String name) { return name(Output.of(name)); } - /** - * @param scopes Authorization scopes for the Application Key. - * - * @return builder - * - */ - public Builder scopes(@Nullable Output> scopes) { - $.scopes = scopes; - return this; - } - - /** - * @param scopes Authorization scopes for the Application Key. - * - * @return builder - * - */ - public Builder scopes(List scopes) { - return scopes(Output.of(scopes)); - } - - /** - * @param scopes Authorization scopes for the Application Key. - * - * @return builder - * - */ - public Builder scopes(String... scopes) { - return scopes(List.of(scopes)); - } - public GetApplicationKeyArgs build() { return $; } diff --git a/sdk/java/src/main/java/com/pulumi/datadog/inputs/GetApplicationKeyPlainArgs.java b/sdk/java/src/main/java/com/pulumi/datadog/inputs/GetApplicationKeyPlainArgs.java index 05dc4a0ac..19dcfd7d0 100644 --- a/sdk/java/src/main/java/com/pulumi/datadog/inputs/GetApplicationKeyPlainArgs.java +++ b/sdk/java/src/main/java/com/pulumi/datadog/inputs/GetApplicationKeyPlainArgs.java @@ -6,7 +6,6 @@ import com.pulumi.core.annotations.Import; import java.lang.Boolean; import java.lang.String; -import java.util.List; import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; @@ -61,28 +60,12 @@ public Optional name() { return Optional.ofNullable(this.name); } - /** - * Authorization scopes for the Application Key. - * - */ - @Import(name="scopes") - private @Nullable List scopes; - - /** - * @return Authorization scopes for the Application Key. - * - */ - public Optional> scopes() { - return Optional.ofNullable(this.scopes); - } - private GetApplicationKeyPlainArgs() {} private GetApplicationKeyPlainArgs(GetApplicationKeyPlainArgs $) { this.exactMatch = $.exactMatch; this.id = $.id; this.name = $.name; - this.scopes = $.scopes; } public static Builder builder() { @@ -136,27 +119,6 @@ public Builder name(@Nullable String name) { return this; } - /** - * @param scopes Authorization scopes for the Application Key. - * - * @return builder - * - */ - public Builder scopes(@Nullable List scopes) { - $.scopes = scopes; - return this; - } - - /** - * @param scopes Authorization scopes for the Application Key. - * - * @return builder - * - */ - public Builder scopes(String... scopes) { - return scopes(List.of(scopes)); - } - public GetApplicationKeyPlainArgs build() { return $; } diff --git a/sdk/java/src/main/java/com/pulumi/datadog/outputs/GetApplicationKeyResult.java b/sdk/java/src/main/java/com/pulumi/datadog/outputs/GetApplicationKeyResult.java index cf5de05fc..5f8463594 100644 --- a/sdk/java/src/main/java/com/pulumi/datadog/outputs/GetApplicationKeyResult.java +++ b/sdk/java/src/main/java/com/pulumi/datadog/outputs/GetApplicationKeyResult.java @@ -7,7 +7,6 @@ import com.pulumi.exceptions.MissingRequiredPropertyException; import java.lang.Boolean; import java.lang.String; -import java.util.List; import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; @@ -34,11 +33,6 @@ public final class GetApplicationKeyResult { * */ private @Nullable String name; - /** - * @return Authorization scopes for the Application Key. - * - */ - private @Nullable List scopes; private GetApplicationKeyResult() {} /** @@ -69,13 +63,6 @@ public String key() { public Optional name() { return Optional.ofNullable(this.name); } - /** - * @return Authorization scopes for the Application Key. - * - */ - public List scopes() { - return this.scopes == null ? List.of() : this.scopes; - } public static Builder builder() { return new Builder(); @@ -90,7 +77,6 @@ public static final class Builder { private @Nullable String id; private String key; private @Nullable String name; - private @Nullable List scopes; public Builder() {} public Builder(GetApplicationKeyResult defaults) { Objects.requireNonNull(defaults); @@ -98,7 +84,6 @@ public Builder(GetApplicationKeyResult defaults) { this.id = defaults.id; this.key = defaults.key; this.name = defaults.name; - this.scopes = defaults.scopes; } @CustomType.Setter @@ -127,22 +112,12 @@ public Builder name(@Nullable String name) { this.name = name; return this; } - @CustomType.Setter - public Builder scopes(@Nullable List scopes) { - - this.scopes = scopes; - return this; - } - public Builder scopes(String... scopes) { - return scopes(List.of(scopes)); - } public GetApplicationKeyResult build() { final var _resultValue = new GetApplicationKeyResult(); _resultValue.exactMatch = exactMatch; _resultValue.id = id; _resultValue.key = key; _resultValue.name = name; - _resultValue.scopes = scopes; return _resultValue; } } diff --git a/sdk/nodejs/getApplicationKey.ts b/sdk/nodejs/getApplicationKey.ts index 83ac7d692..cc913805d 100644 --- a/sdk/nodejs/getApplicationKey.ts +++ b/sdk/nodejs/getApplicationKey.ts @@ -25,7 +25,6 @@ export function getApplicationKey(args?: GetApplicationKeyArgs, opts?: pulumi.In "exactMatch": args.exactMatch, "id": args.id, "name": args.name, - "scopes": args.scopes, }, opts); } @@ -45,10 +44,6 @@ export interface GetApplicationKeyArgs { * Name for Application Key. */ name?: string; - /** - * Authorization scopes for the Application Key. - */ - scopes?: string[]; } /** @@ -71,10 +66,6 @@ export interface GetApplicationKeyResult { * Name for Application Key. */ readonly name?: string; - /** - * Authorization scopes for the Application Key. - */ - readonly scopes?: string[]; } /** * Use this data source to retrieve information about an existing application key. Deprecated. This will be removed in a future release with prior notice. Securely store your application keys using a secret management system or use the datadog.ApplicationKey resource to manage application keys in your Datadog account. @@ -97,7 +88,6 @@ export function getApplicationKeyOutput(args?: GetApplicationKeyOutputArgs, opts "exactMatch": args.exactMatch, "id": args.id, "name": args.name, - "scopes": args.scopes, }, opts); } @@ -117,8 +107,4 @@ export interface GetApplicationKeyOutputArgs { * Name for Application Key. */ name?: pulumi.Input; - /** - * Authorization scopes for the Application Key. - */ - scopes?: pulumi.Input[]>; } diff --git a/sdk/python/pulumi_datadog/get_application_key.py b/sdk/python/pulumi_datadog/get_application_key.py index 256f58876..a17116325 100644 --- a/sdk/python/pulumi_datadog/get_application_key.py +++ b/sdk/python/pulumi_datadog/get_application_key.py @@ -26,7 +26,7 @@ class GetApplicationKeyResult: """ A collection of values returned by getApplicationKey. """ - def __init__(__self__, exact_match=None, id=None, key=None, name=None, scopes=None): + def __init__(__self__, exact_match=None, id=None, key=None, name=None): if exact_match and not isinstance(exact_match, bool): raise TypeError("Expected argument 'exact_match' to be a bool") pulumi.set(__self__, "exact_match", exact_match) @@ -39,9 +39,6 @@ def __init__(__self__, exact_match=None, id=None, key=None, name=None, scopes=No if name and not isinstance(name, str): raise TypeError("Expected argument 'name' to be a str") pulumi.set(__self__, "name", name) - if scopes and not isinstance(scopes, list): - raise TypeError("Expected argument 'scopes' to be a list") - pulumi.set(__self__, "scopes", scopes) @property @pulumi.getter(name="exactMatch") @@ -75,14 +72,6 @@ def name(self) -> Optional[str]: """ return pulumi.get(self, "name") - @property - @pulumi.getter - def scopes(self) -> Optional[Sequence[str]]: - """ - Authorization scopes for the Application Key. - """ - return pulumi.get(self, "scopes") - class AwaitableGetApplicationKeyResult(GetApplicationKeyResult): # pylint: disable=using-constant-test @@ -93,14 +82,12 @@ def __await__(self): exact_match=self.exact_match, id=self.id, key=self.key, - name=self.name, - scopes=self.scopes) + name=self.name) def get_application_key(exact_match: Optional[bool] = None, id: Optional[str] = None, name: Optional[str] = None, - scopes: Optional[Sequence[str]] = None, opts: Optional[pulumi.InvokeOptions] = None) -> AwaitableGetApplicationKeyResult: """ Use this data source to retrieve information about an existing application key. Deprecated. This will be removed in a future release with prior notice. Securely store your application keys using a secret management system or use the ApplicationKey resource to manage application keys in your Datadog account. @@ -118,13 +105,11 @@ def get_application_key(exact_match: Optional[bool] = None, :param bool exact_match: Whether to use exact match when searching by name. :param str id: Id for Application Key. :param str name: Name for Application Key. - :param Sequence[str] scopes: Authorization scopes for the Application Key. """ __args__ = dict() __args__['exactMatch'] = exact_match __args__['id'] = id __args__['name'] = name - __args__['scopes'] = scopes opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts) __ret__ = pulumi.runtime.invoke('datadog:index/getApplicationKey:getApplicationKey', __args__, opts=opts, typ=GetApplicationKeyResult).value @@ -132,12 +117,10 @@ def get_application_key(exact_match: Optional[bool] = None, exact_match=pulumi.get(__ret__, 'exact_match'), id=pulumi.get(__ret__, 'id'), key=pulumi.get(__ret__, 'key'), - name=pulumi.get(__ret__, 'name'), - scopes=pulumi.get(__ret__, 'scopes')) + name=pulumi.get(__ret__, 'name')) def get_application_key_output(exact_match: Optional[pulumi.Input[Optional[bool]]] = None, id: Optional[pulumi.Input[Optional[str]]] = None, name: Optional[pulumi.Input[Optional[str]]] = None, - scopes: Optional[pulumi.Input[Optional[Sequence[str]]]] = None, opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetApplicationKeyResult]: """ Use this data source to retrieve information about an existing application key. Deprecated. This will be removed in a future release with prior notice. Securely store your application keys using a secret management system or use the ApplicationKey resource to manage application keys in your Datadog account. @@ -155,18 +138,15 @@ def get_application_key_output(exact_match: Optional[pulumi.Input[Optional[bool] :param bool exact_match: Whether to use exact match when searching by name. :param str id: Id for Application Key. :param str name: Name for Application Key. - :param Sequence[str] scopes: Authorization scopes for the Application Key. """ __args__ = dict() __args__['exactMatch'] = exact_match __args__['id'] = id __args__['name'] = name - __args__['scopes'] = scopes opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts) __ret__ = pulumi.runtime.invoke_output('datadog:index/getApplicationKey:getApplicationKey', __args__, opts=opts, typ=GetApplicationKeyResult) return __ret__.apply(lambda __response__: GetApplicationKeyResult( exact_match=pulumi.get(__response__, 'exact_match'), id=pulumi.get(__response__, 'id'), key=pulumi.get(__response__, 'key'), - name=pulumi.get(__response__, 'name'), - scopes=pulumi.get(__response__, 'scopes'))) + name=pulumi.get(__response__, 'name'))) diff --git a/upstream b/upstream index 36862e85f..fae4723c6 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 36862e85fbae7027417ba6e6418a823e94914718 +Subproject commit fae4723c65704c7edb65807211832fc3c82cffc4