Only require any input parameters to be specified if they differ from the defaults

Author: tobio

docker-compose.yml

@@ -66,6 +66,7 @@ services:
       ELASTICSEARCH_PASSWORD: ${KIBANA_PASSWORD}
       XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY: ${KIBANA_ENCRYPTION_KEY}
       ELASTICSEARCH_PUBLICBASEURL: http://localhost:${ELASTICSEARCH_PORT}
+      SERVER_OAS_ENABLED: true
     healthcheck:
       test:
         [

docs/resources/fleet_integration_policy.md

@@ -109,7 +109,7 @@ resource "elasticstack_fleet_integration_policy" "sample" {
 - `output_id` (String) The ID of the output to send data to. When not specified, the default output of the agent policy will be used.
 - `policy_id` (String) Unique identifier of the integration policy.
 - `space_ids` (Set of String) The Kibana space IDs where this integration policy is available. When set, must match the space_ids of the referenced agent policy. If not set, will be inherited from the agent policy. Note: The order of space IDs does not matter as this is a set.
-- `vars_json` (String, Sensitive) Integration-level variables as JSON.
+- `vars_json` (String) Integration-level variables as JSON.
 
 ### Read-Only
 
@@ -122,15 +122,36 @@ Optional:
 
 - `enabled` (Boolean) Enable the input.
 - `streams` (Attributes Map) Input streams mapped by stream ID. (see [below for nested schema](#nestedatt--inputs--streams))
-- `vars` (String, Sensitive) Input-level variables as JSON.
+- `vars` (String) Input-level variables as JSON.
+
+Read-Only:
+
+- `defaults` (Attributes) Input defaults. (see [below for nested schema](#nestedatt--inputs--defaults))
 
 <a id="nestedatt--inputs--streams"></a>
 ### Nested Schema for `inputs.streams`
 
 Optional:
 
 - `enabled` (Boolean) Enable the stream.
-- `vars` (String, Sensitive) Stream-level variables as JSON.
+- `vars` (String) Stream-level variables as JSON.
+
+
+<a id="nestedatt--inputs--defaults"></a>
+### Nested Schema for `inputs.defaults`
+
+Read-Only:
+
+- `streams` (Attributes Map) Stream-level defaults mapped by stream ID. (see [below for nested schema](#nestedatt--inputs--defaults--streams))
+- `vars` (String) Input-level variable defaults as JSON.
+
+<a id="nestedatt--inputs--defaults--streams"></a>
+### Nested Schema for `inputs.defaults.streams`
+
+Read-Only:
+
+- `enabled` (Boolean) Default enabled state for the stream.
+- `vars` (String) Stream-level variable defaults as JSON.
 
 ## Import
 

internal/fleet/integration_policy/acc_test.go

@@ -276,9 +276,14 @@ func TestAccResourceIntegrationPolicySecrets(t *testing.T) {
 						"policy_name": config.StringVariable(policyName),
 						"secret_key":  config.StringVariable("updated"),
 					},
-					ImportState:             true,
-					ImportStateVerify:       true,
-					ImportStateVerifyIgnore: []string{"vars_json", "space_ids"},
+					ImportState:       true,
+					ImportStateVerify: true,
+					ImportStateVerifyIgnore: []string{
+						"vars_json",
+						"space_ids",
+						"inputs.aws_logs-aws-cloudwatch.defaults",
+						"inputs.aws_logs-aws-s3.defaults",
+					},
 					Check: resource.ComposeTestCheckFunc(
 						resource.TestMatchResourceAttr("elasticstack_fleet_integration_policy.test_policy", "vars_json", regexp.MustCompile(`{"access_key_id":{"id":"\S+","isSecretRef":true},"default_region":"us-east-2","endpoint":"endpoint","secret_access_key":{"id":"\S+","isSecretRef":true},"session_token":{"id":"\S+","isSecretRef":true}}`)),
 					),
@@ -398,6 +403,40 @@ func TestAccIntegrationPolicyInputs(t *testing.T) {
 					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "inputs.kafka-logfile.enabled", "false"),
 				),
 			},
+			{
+				ProtoV6ProviderFactories: acctest.Providers,
+				SkipFunc:                 versionutils.CheckIfVersionIsUnsupported(minVersionIntegrationPolicy),
+				ConfigDirectory:          acctest.NamedTestCaseDirectory("minimal"),
+				ConfigVariables: config.Variables{
+					"policy_name": config.StringVariable(policyName),
+				},
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "name", policyName),
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "description", "Kafka Integration Policy - Minimal"),
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "integration_name", "kafka"),
+					// Check specified inputs
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "inputs.kafka-logfile.enabled", "false"),
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "inputs.kafka-kafka/metrics.enabled", "true"),
+					// Check unspecified, disabled by default input
+					resource.TestCheckNoResourceAttr("elasticstack_fleet_integration_policy.test_policy", "inputs.kafka-jolokia/metrics"),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.Providers,
+				SkipFunc:                 versionutils.CheckIfVersionIsUnsupported(minVersionIntegrationPolicy),
+				ConfigDirectory:          acctest.NamedTestCaseDirectory("unset"),
+				ConfigVariables: config.Variables{
+					"policy_name": config.StringVariable(policyName),
+				},
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "name", policyName),
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "description", "Kafka Integration Policy - Minimal"),
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "integration_name", "kafka"),
+					// Check previously specified inputs
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "inputs.kafka-logfile.enabled", "false"),
+					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "inputs.kafka-kafka/metrics.enabled", "true"),
+				),
+			},
 		},
 	})
 }

internal/fleet/integration_policy/create.go

@@ -67,7 +67,13 @@ func (r *integrationPolicyResource) Create(ctx context.Context, req resource.Cre
 	// Remember if the user configured input in the plan
 	planHadInput := utils.IsKnown(planModel.Inputs) && !planModel.Inputs.IsNull() && len(planModel.Inputs.Elements()) > 0
 
-	diags = planModel.populateFromAPI(ctx, policy)
+	pkg, diags := fleet.GetPackage(ctx, client, policy.Package.Name, policy.Package.Version)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	diags = planModel.populateFromAPI(ctx, pkg, policy)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return

internal/fleet/integration_policy/input_type.go

@@ -0,0 +1,74 @@
+package integration_policy
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
+)
+
+var (
+	_ basetypes.ObjectTypable                    = (*InputType)(nil)
+	_ basetypes.ObjectValuableWithSemanticEquals = (*InputValue)(nil)
+)
+
+// InputType is a custom type for an individual input that supports semantic equality
+type InputType struct {
+	basetypes.ObjectType
+}
+
+// String returns a human readable string of the type name.
+func (t InputType) String() string {
+	return "integration_policy.InputType"
+}
+
+// ValueType returns the Value type.
+func (t InputType) ValueType(ctx context.Context) attr.Value {
+	return InputValue{
+		ObjectValue: basetypes.NewObjectUnknown(t.AttributeTypes()),
+	}
+}
+
+// Equal returns true if the given type is equivalent.
+func (t InputType) Equal(o attr.Type) bool {
+	other, ok := o.(InputType)
+	if !ok {
+		return false
+	}
+	return t.ObjectType.Equal(other.ObjectType)
+}
+
+// ValueFromObject returns an ObjectValuable type given a basetypes.ObjectValue.
+func (t InputType) ValueFromObject(ctx context.Context, in basetypes.ObjectValue) (basetypes.ObjectValuable, diag.Diagnostics) {
+	return InputValue{
+		ObjectValue: in,
+	}, nil
+}
+
+// ValueFromTerraform returns a Value given a tftypes.Value.
+func (t InputType) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) {
+	attrValue, err := t.ObjectType.ValueFromTerraform(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	objectValue, ok := attrValue.(basetypes.ObjectValue)
+	if !ok {
+		return nil, err
+	}
+
+	return InputValue{
+		ObjectValue: objectValue,
+	}, nil
+}
+
+// NewInputType creates a new InputType with the given attribute types
+func NewInputType(attrTypes map[string]attr.Type) InputType {
+	return InputType{
+		ObjectType: basetypes.ObjectType{
+			AttrTypes: attrTypes,
+		},
+	}
+}