diff --git a/CHANGELOG.md b/CHANGELOG.md index 71da2cfa..2badf8a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Unreleased +## v0.9.3 + +- Allow creating `chronosphere_slack_notifier` with actions without `action_confirm_text`. +- Fix `chronosphere_rollup_rule` and `chronosphere_mapping_rule` diff after applying a rule without an interval or storage policy. + ## v0.9.2 ### Features diff --git a/provider/cmd/pulumi-resource-chronosphere/schema.json b/provider/cmd/pulumi-resource-chronosphere/schema.json index 44e2c2ad..a807b806 100644 --- a/provider/cmd/pulumi-resource-chronosphere/schema.json +++ b/provider/cmd/pulumi-resource-chronosphere/schema.json @@ -3343,6 +3343,7 @@ }, "required": [ "filter", + "interval", "name", "slug" ], @@ -4390,10 +4391,10 @@ }, "required": [ "filter", + "interval", "metricType", "name", - "slug", - "storagePolicies" + "slug" ], "inputProperties": { "aggregation": { diff --git a/provider/go.mod b/provider/go.mod index 3d6fd663..a7cdf3b5 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -79,7 +79,7 @@ require ( github.com/charmbracelet/bubbletea v0.24.2 // indirect github.com/charmbracelet/lipgloss v0.7.1 // indirect github.com/cheggaaa/pb v1.0.29 // indirect - github.com/chronosphereio/terraform-provider-chronosphere v1.5.0 // indirect + github.com/chronosphereio/terraform-provider-chronosphere v1.5.1 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect diff --git a/provider/go.sum b/provider/go.sum index 80b9d067..00e6de09 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -929,8 +929,8 @@ github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAc github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/cheggaaa/pb v1.0.29 h1:FckUN5ngEk2LpvuG0fw1GEFx6LtyY2pWI/Z2QgCnEYo= github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuPxX30= -github.com/chronosphereio/terraform-provider-chronosphere v1.5.0 h1:XLodvwC62c4yEVYVa/WQgDIeyDiOvj8l0ONh+69PF5M= -github.com/chronosphereio/terraform-provider-chronosphere v1.5.0/go.mod h1:Aj+ZF3Ncra9gNWU96t3Fk4KghEMv3h8bW8gyeWXZaSo= +github.com/chronosphereio/terraform-provider-chronosphere v1.5.1 h1:PBIeQv7w6FE0pywpeduYpEwDSmhx8JsxPWodx5UBzDs= +github.com/chronosphereio/terraform-provider-chronosphere v1.5.1/go.mod h1:Aj+ZF3Ncra9gNWU96t3Fk4KghEMv3h8bW8gyeWXZaSo= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= diff --git a/sdk/dotnet/MappingRule.cs b/sdk/dotnet/MappingRule.cs index 6925bf96..ab674bd4 100644 --- a/sdk/dotnet/MappingRule.cs +++ b/sdk/dotnet/MappingRule.cs @@ -29,7 +29,7 @@ public partial class MappingRule : global::Pulumi.CustomResource public Output Filter { get; private set; } = null!; [Output("interval")] - public Output Interval { get; private set; } = null!; + public Output Interval { get; private set; } = null!; [Output("mode")] public Output Mode { get; private set; } = null!; diff --git a/sdk/dotnet/RollupRule.cs b/sdk/dotnet/RollupRule.cs index 234c9854..1e75e8a7 100644 --- a/sdk/dotnet/RollupRule.cs +++ b/sdk/dotnet/RollupRule.cs @@ -35,7 +35,7 @@ public partial class RollupRule : global::Pulumi.CustomResource public Output> GroupBies { get; private set; } = null!; [Output("interval")] - public Output Interval { get; private set; } = null!; + public Output Interval { get; private set; } = null!; [Output("metricType")] public Output MetricType { get; private set; } = null!; @@ -59,7 +59,7 @@ public partial class RollupRule : global::Pulumi.CustomResource public Output Slug { get; private set; } = null!; [Output("storagePolicies")] - public Output StoragePolicies { get; private set; } = null!; + public Output StoragePolicies { get; private set; } = null!; /// diff --git a/sdk/go/chronosphere/mappingRule.go b/sdk/go/chronosphere/mappingRule.go index bcc9f361..96e7c1a4 100644 --- a/sdk/go/chronosphere/mappingRule.go +++ b/sdk/go/chronosphere/mappingRule.go @@ -21,7 +21,7 @@ type MappingRule struct { // Deprecated: drop timestamp is no longer supported DropTimestamp pulumi.BoolPtrOutput `pulumi:"dropTimestamp"` Filter pulumi.StringOutput `pulumi:"filter"` - Interval pulumi.StringPtrOutput `pulumi:"interval"` + Interval pulumi.StringOutput `pulumi:"interval"` Mode pulumi.StringPtrOutput `pulumi:"mode"` Name pulumi.StringOutput `pulumi:"name"` Slug pulumi.StringOutput `pulumi:"slug"` @@ -237,8 +237,8 @@ func (o MappingRuleOutput) Filter() pulumi.StringOutput { return o.ApplyT(func(v *MappingRule) pulumi.StringOutput { return v.Filter }).(pulumi.StringOutput) } -func (o MappingRuleOutput) Interval() pulumi.StringPtrOutput { - return o.ApplyT(func(v *MappingRule) pulumi.StringPtrOutput { return v.Interval }).(pulumi.StringPtrOutput) +func (o MappingRuleOutput) Interval() pulumi.StringOutput { + return o.ApplyT(func(v *MappingRule) pulumi.StringOutput { return v.Interval }).(pulumi.StringOutput) } func (o MappingRuleOutput) Mode() pulumi.StringPtrOutput { diff --git a/sdk/go/chronosphere/rollupRule.go b/sdk/go/chronosphere/rollupRule.go index 51c7246f..4c16ed15 100644 --- a/sdk/go/chronosphere/rollupRule.go +++ b/sdk/go/chronosphere/rollupRule.go @@ -22,7 +22,7 @@ type RollupRule struct { Filter pulumi.StringOutput `pulumi:"filter"` GraphiteLabelPolicy RollupRuleGraphiteLabelPolicyPtrOutput `pulumi:"graphiteLabelPolicy"` GroupBies pulumi.StringArrayOutput `pulumi:"groupBies"` - Interval pulumi.StringPtrOutput `pulumi:"interval"` + Interval pulumi.StringOutput `pulumi:"interval"` MetricType pulumi.StringOutput `pulumi:"metricType"` MetricTypeTag pulumi.BoolPtrOutput `pulumi:"metricTypeTag"` Mode pulumi.StringPtrOutput `pulumi:"mode"` @@ -31,7 +31,7 @@ type RollupRule struct { Permissive pulumi.BoolPtrOutput `pulumi:"permissive"` Slug pulumi.StringOutput `pulumi:"slug"` // Deprecated: use `interval` instead - StoragePolicies RollupRuleStoragePoliciesOutput `pulumi:"storagePolicies"` + StoragePolicies RollupRuleStoragePoliciesPtrOutput `pulumi:"storagePolicies"` } // NewRollupRule registers a new resource with the given unique name, arguments, and options. @@ -275,8 +275,8 @@ func (o RollupRuleOutput) GroupBies() pulumi.StringArrayOutput { return o.ApplyT(func(v *RollupRule) pulumi.StringArrayOutput { return v.GroupBies }).(pulumi.StringArrayOutput) } -func (o RollupRuleOutput) Interval() pulumi.StringPtrOutput { - return o.ApplyT(func(v *RollupRule) pulumi.StringPtrOutput { return v.Interval }).(pulumi.StringPtrOutput) +func (o RollupRuleOutput) Interval() pulumi.StringOutput { + return o.ApplyT(func(v *RollupRule) pulumi.StringOutput { return v.Interval }).(pulumi.StringOutput) } func (o RollupRuleOutput) MetricType() pulumi.StringOutput { @@ -308,8 +308,8 @@ func (o RollupRuleOutput) Slug() pulumi.StringOutput { } // Deprecated: use `interval` instead -func (o RollupRuleOutput) StoragePolicies() RollupRuleStoragePoliciesOutput { - return o.ApplyT(func(v *RollupRule) RollupRuleStoragePoliciesOutput { return v.StoragePolicies }).(RollupRuleStoragePoliciesOutput) +func (o RollupRuleOutput) StoragePolicies() RollupRuleStoragePoliciesPtrOutput { + return o.ApplyT(func(v *RollupRule) RollupRuleStoragePoliciesPtrOutput { return v.StoragePolicies }).(RollupRuleStoragePoliciesPtrOutput) } type RollupRuleArrayOutput struct{ *pulumi.OutputState } diff --git a/sdk/java/src/main/java/io/chronosphere/chronosphere/MappingRule.java b/sdk/java/src/main/java/io/chronosphere/chronosphere/MappingRule.java index 04b1f9ee..7dbc93dc 100644 --- a/sdk/java/src/main/java/io/chronosphere/chronosphere/MappingRule.java +++ b/sdk/java/src/main/java/io/chronosphere/chronosphere/MappingRule.java @@ -55,10 +55,10 @@ public Output filter() { return this.filter; } @Export(name="interval", refs={String.class}, tree="[0]") - private Output interval; + private Output interval; - public Output> interval() { - return Codegen.optional(this.interval); + public Output interval() { + return this.interval; } @Export(name="mode", refs={String.class}, tree="[0]") private Output mode; diff --git a/sdk/java/src/main/java/io/chronosphere/chronosphere/RollupRule.java b/sdk/java/src/main/java/io/chronosphere/chronosphere/RollupRule.java index f17b8b70..76166b29 100644 --- a/sdk/java/src/main/java/io/chronosphere/chronosphere/RollupRule.java +++ b/sdk/java/src/main/java/io/chronosphere/chronosphere/RollupRule.java @@ -63,10 +63,10 @@ public Output>> groupBies() { return Codegen.optional(this.groupBies); } @Export(name="interval", refs={String.class}, tree="[0]") - private Output interval; + private Output interval; - public Output> interval() { - return Codegen.optional(this.interval); + public Output interval() { + return this.interval; } @Export(name="metricType", refs={String.class}, tree="[0]") private Output metricType; @@ -117,10 +117,10 @@ public Output slug() { */ @Deprecated /* use `interval` instead */ @Export(name="storagePolicies", refs={RollupRuleStoragePolicies.class}, tree="[0]") - private Output storagePolicies; + private Output storagePolicies; - public Output storagePolicies() { - return this.storagePolicies; + public Output> storagePolicies() { + return Codegen.optional(this.storagePolicies); } /** diff --git a/sdk/nodejs/mappingRule.ts b/sdk/nodejs/mappingRule.ts index fa030371..ddc7007a 100644 --- a/sdk/nodejs/mappingRule.ts +++ b/sdk/nodejs/mappingRule.ts @@ -42,7 +42,7 @@ export class MappingRule extends pulumi.CustomResource { */ public readonly dropTimestamp!: pulumi.Output; public readonly filter!: pulumi.Output; - public readonly interval!: pulumi.Output; + public readonly interval!: pulumi.Output; public readonly mode!: pulumi.Output; public readonly name!: pulumi.Output; public readonly slug!: pulumi.Output; diff --git a/sdk/nodejs/rollupRule.ts b/sdk/nodejs/rollupRule.ts index bd48bdbb..0db0a440 100644 --- a/sdk/nodejs/rollupRule.ts +++ b/sdk/nodejs/rollupRule.ts @@ -41,7 +41,7 @@ export class RollupRule extends pulumi.CustomResource { public readonly filter!: pulumi.Output; public readonly graphiteLabelPolicy!: pulumi.Output; public readonly groupBies!: pulumi.Output; - public readonly interval!: pulumi.Output; + public readonly interval!: pulumi.Output; public readonly metricType!: pulumi.Output; public readonly metricTypeTag!: pulumi.Output; public readonly mode!: pulumi.Output; @@ -52,7 +52,7 @@ export class RollupRule extends pulumi.CustomResource { /** * @deprecated use `interval` instead */ - public readonly storagePolicies!: pulumi.Output; + public readonly storagePolicies!: pulumi.Output; /** * Create a RollupRule resource with the given unique name, arguments, and options. diff --git a/sdk/python/pulumi_chronosphere/mapping_rule.py b/sdk/python/pulumi_chronosphere/mapping_rule.py index a6203569..669d2378 100644 --- a/sdk/python/pulumi_chronosphere/mapping_rule.py +++ b/sdk/python/pulumi_chronosphere/mapping_rule.py @@ -442,7 +442,7 @@ def filter(self) -> pulumi.Output[str]: @property @pulumi.getter - def interval(self) -> pulumi.Output[Optional[str]]: + def interval(self) -> pulumi.Output[str]: return pulumi.get(self, "interval") @property diff --git a/sdk/python/pulumi_chronosphere/rollup_rule.py b/sdk/python/pulumi_chronosphere/rollup_rule.py index ca964091..97ccd04e 100644 --- a/sdk/python/pulumi_chronosphere/rollup_rule.py +++ b/sdk/python/pulumi_chronosphere/rollup_rule.py @@ -613,7 +613,7 @@ def group_bies(self) -> pulumi.Output[Optional[Sequence[str]]]: @property @pulumi.getter - def interval(self) -> pulumi.Output[Optional[str]]: + def interval(self) -> pulumi.Output[str]: return pulumi.get(self, "interval") @property @@ -653,7 +653,7 @@ def slug(self) -> pulumi.Output[str]: @property @pulumi.getter(name="storagePolicies") - def storage_policies(self) -> pulumi.Output['outputs.RollupRuleStoragePolicies']: + def storage_policies(self) -> pulumi.Output[Optional['outputs.RollupRuleStoragePolicies']]: warnings.warn("""use `interval` instead""", DeprecationWarning) pulumi.log.warn("""storage_policies is deprecated: use `interval` instead""")