Waypoint application input vars

.changelog/833.txt

@@ -0,0 +1,4 @@
+```release-note:improvement
+Add support for input variables to `hcp_waypoint_application` resource and
+data source.
+```

docs/data-sources/waypoint_application.md

@@ -17,6 +17,7 @@ The Waypoint Application data source retrieves information on a given Applicatio
 ### Optional
 
 - `id` (String) The ID of the Application.
+- `input_variables` (Attributes Set) Input variables for the Application. (see [below for nested schema](#nestedatt--input_variables))
 - `name` (String) The name of the Application.
 - `project_id` (String) The ID of the HCP project where the Waypoint Application is located.
 
@@ -27,3 +28,12 @@ The Waypoint Application data source retrieves information on a given Applicatio
 - `namespace_id` (String) Internal Namespace ID.
 - `organization_id` (String) The ID of the HCP organization where the Waypoint Application is located.
 - `readme_markdown` (String) Instructions for using the Application (markdown format supported).
+
+<a id="nestedatt--input_variables"></a>
+### Nested Schema for `input_variables`
+
+Read-Only:
+
+- `name` (String) Variable name
+- `value` (String) Variable value
+- `variable_type` (String) Variable type

docs/resources/waypoint_application.md

@@ -21,6 +21,7 @@ The Waypoint Application resource managed the lifecycle of an Application that's
 
 ### Optional
 
+- `application_input_variables` (Attributes Set) Input variables set for the application. (see [below for nested schema](#nestedatt--application_input_variables))
 - `project_id` (String) The ID of the HCP project where the Waypoint Application is located.
 - `readme_markdown` (String) Instructions for using the Application (markdown format supported). Note: this is a base64 encoded string, and can only be set in configuration after initial creation. The initial version of the README is generated from the README Template from source Application Template.
 
@@ -30,3 +31,26 @@ The Waypoint Application resource managed the lifecycle of an Application that's
 - `id` (String) The ID of the Application.
 - `namespace_id` (String) Internal Namespace ID.
 - `organization_id` (String) The ID of the HCP organization where the Waypoint Application is located.
+- `template_input_variables` (Attributes Set) Input variables set for the application. (see [below for nested schema](#nestedatt--template_input_variables))
+
+<a id="nestedatt--application_input_variables"></a>
+### Nested Schema for `application_input_variables`
+
+Required:
+
+- `name` (String) Variable name
+- `value` (String) Variable value
+- `variable_type` (String) Variable type
+
+
+<a id="nestedatt--template_input_variables"></a>
+### Nested Schema for `template_input_variables`
+
+Required:
+
+- `name` (String) Variable name
+- `value` (String) Variable value
+
+Optional:
+
+- `variable_type` (String) Variable type

docs/resources/waypoint_application_template.md

@@ -58,9 +58,9 @@ Required:
 Required:
 
 - `name` (String) Variable name
-- `options` (List of String) List of options
 - `variable_type` (String) Variable type
 
 Optional:
 
+- `options` (List of String) List of options
 - `user_editable` (Boolean) Whether the variable is editable by the user creating an application

internal/clients/waypoint.go

@@ -177,3 +177,21 @@ func GetAddOnByID(ctx context.Context, client *Client, loc *sharedmodels.Hashico
 	}
 	return getResp.GetPayload().AddOn, nil
 }
+
+func GetInputVariables(ctx context.Context, client *Client, workspaceName string, loc *sharedmodels.HashicorpCloudLocationLocation) ([]*waypoint_models.HashicorpCloudWaypointInputVariable, error) {
+	ns, err := getNamespaceByLocation(ctx, client, loc)
+	if err != nil {
+		return nil, err
+	}
+
+	params := &waypoint_service.WaypointServiceGetTFRunStatusParams{
+		WorkspaceName: workspaceName,
+		NamespaceID:   ns.ID,
+	}
+
+	getResp, err := client.Waypoint.WaypointServiceGetTFRunStatus(params, nil)
+	if err != nil {
+		return nil, err
+	}
+	return getResp.GetPayload().InputVariables, nil
+}

internal/provider/waypoint/data_source_waypoint_application.go

@@ -80,6 +80,26 @@ func (d *DataSourceApplication) Schema(ctx context.Context, req datasource.Schem
 				Computed:    true,
 				Description: "Internal Namespace ID.",
 			},
+			"input_variables": schema.SetNestedAttribute{
+				Optional:    true,
+				Description: "Input variables for the Application.",
+				NestedObject: schema.NestedAttributeObject{
+					Attributes: map[string]schema.Attribute{
+						"name": &schema.StringAttribute{
+							Computed:    true,
+							Description: "Variable name",
+						},
+						"value": &schema.StringAttribute{
+							Computed:    true,
+							Description: "Variable value",
+						},
+						"variable_type": &schema.StringAttribute{
+							Computed:    true,
+							Description: "Variable type",
+						},
+					},
+				},
+			},
 		},
 	}
 }
@@ -100,8 +120,28 @@ func (d *DataSourceApplication) Configure(ctx context.Context, req datasource.Co
 	d.client = client
 }
 
+// ApplicationDataSourceModel describes the data source data model
+type ApplicationDataSourceModel struct {
+	ID                      types.String `tfsdk:"id"`
+	Name                    types.String `tfsdk:"name"`
+	ProjectID               types.String `tfsdk:"project_id"`
+	OrgID                   types.String `tfsdk:"organization_id"`
+	ReadmeMarkdown          types.String `tfsdk:"readme_markdown"`
+	ApplicationTemplateID   types.String `tfsdk:"application_template_id"`
+	ApplicationTemplateName types.String `tfsdk:"application_template_name"`
+	NamespaceID             types.String `tfsdk:"namespace_id"`
+
+	// deferred for now
+	// Tags       types.List `tfsdk:"tags"`
+
+	// deferred and probably a list or objects, but may possible be a separate
+	// ActionCfgs types.List `tfsdk:"action_cfgs"`
+
+	InputVars types.Set `tfsdk:"input_variables"`
+}
+
 func (d *DataSourceApplication) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
-	var data ApplicationResourceModel
+	var data ApplicationDataSourceModel
 	resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
 
 	client := d.client
@@ -146,5 +186,30 @@ func (d *DataSourceApplication) Read(ctx context.Context, req datasource.ReadReq
 		data.ReadmeMarkdown = types.StringNull()
 	}
 
+	// A second API call is made to get the input vars set on the application
+	inputVars, err := clients.GetInputVariables(ctx, client, data.Name.ValueString(), loc)
+	if err != nil {
+		resp.Diagnostics.AddError(err.Error(), "Failed to fetch application's input variables.")
+		return
+	}
+
+	inputVariables := make([]*InputVar, 0)
+	for _, iv := range inputVars {
+		inputVariables = append(inputVariables, &InputVar{
+			Name:  types.StringValue(iv.Name),
+			Value: types.StringValue(iv.Value),
+		})
+	}
+	if len(inputVariables) > 0 {
+		aivs, diags := types.SetValueFrom(ctx, types.ObjectType{AttrTypes: InputVar{}.attrTypes()}, inputVariables)
+		resp.Diagnostics.Append(diags...)
+		if diags.HasError() {
+			return
+		}
+		data.InputVars = aivs
+	} else {
+		data.InputVars = types.SetNull(types.ObjectType{AttrTypes: InputVar{}.attrTypes()})
+	}
+
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

internal/provider/waypoint/data_source_waypoint_application_template_test.go

@@ -40,10 +40,6 @@ func TestAccWaypointData_Application_Template_basic(t *testing.T) {
 				Config: testDataAppTemplateConfig(name),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(dataSourceName, "name", name),
-					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.name", "string_variable"),
-					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.variable_type", "string"),
-					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.options.#", "1"),
-					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.options.0", "a"),
 				),
 			},
 			{
@@ -52,19 +48,61 @@ func TestAccWaypointData_Application_Template_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "name", updatedName),
 					resource.TestCheckResourceAttr(dataSourceName, "name", updatedName),
-					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.name", "string_variable"),
-					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.variable_type", "string"),
-					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.options.#", "1"),
-					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.options.0", "a"),
 				),
 			},
 		},
 	})
 }
 
+func TestAccWaypointData_Application_template_with_variable_options(t *testing.T) {
+	// this is only used to verify the app template gets cleaned up in the end
+	// of the test, and not used for any other purpose at this time
+	var appTemplateModel waypoint.ApplicationTemplateResourceModel
+	resourceName := "hcp_waypoint_application_template.var_opts_test"
+	dataSourceName := "data." + resourceName
+	name := generateRandomName()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             testAccCheckWaypointAppTemplateDestroy(t, &appTemplateModel),
+		Steps: []resource.TestStep{
+			{
+				// establish the base app template
+				// note this reuses the config method from the app template
+				// resource test
+				Config: testAppTemplateConfigWithVarOpts(name),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckWaypointAppTemplateExists(t, resourceName, &appTemplateModel),
+				),
+			},
+			{
+				// add a data source config to read the app template
+				Config: testDataAppTemplateWithVariablesWithOptionsConfig(name),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(dataSourceName, "name", name),
+					resource.TestCheckResourceAttr(dataSourceName, "variable_options.#", "2"),
+					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.name", "faction"),
+					resource.TestCheckResourceAttr(dataSourceName, "variable_options.0.type", "string"),
+					resource.TestCheckResourceAttr(dataSourceName, "variable_options.1.name", "vault_dweller_name"),
+					resource.TestCheckResourceAttr(dataSourceName, "variable_options.1.type", "string"),
+				),
+			},
+		},
+	})
+
+}
+
 func testDataAppTemplateConfig(name string) string {
 	return fmt.Sprintf(`%s
 data "hcp_waypoint_application_template" "test" {
   name    = hcp_waypoint_application_template.test.name
 }`, testAppTemplateConfig(name))
 }
+
+func testDataAppTemplateWithVariablesWithOptionsConfig(name string) string {
+	return fmt.Sprintf(`%s
+data "hcp_waypoint_application_template" "var_opts_test" {
+  name    = hcp_waypoint_application_template.var_opts_test.name
+}`, testAppTemplateConfigWithVarOpts(name))
+}

internal/provider/waypoint/data_source_waypoint_application_test.go

@@ -44,10 +44,52 @@ func TestAccWaypoint_Application_DataSource_basic(t *testing.T) {
 	})
 }
 
+func TestAccWaypoint_Application_DataSource_WithInputVars(t *testing.T) {
+	// this is only used to verify the app template gets cleaned up in the end
+	// of the test, and not used for any other purpose at this time
+	var applicationModel waypoint.ApplicationResourceModel
+	resourceName := "hcp_waypoint_application.test_var_opts"
+	dataSourceName := "data." + resourceName
+	templateName := generateRandomName()
+	applicationName := generateRandomName()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             testAccCheckWaypointApplicationDestroy(t, &applicationModel),
+		Steps: []resource.TestStep{
+			{
+				// establish the base app template and application
+				Config: testApplicationWithInputVarsConfig(templateName, applicationName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckWaypointApplicationExists(t, resourceName, &applicationModel),
+				),
+			},
+			{
+				// add a data source config to read the app template
+				Config: testDataApplicationWithInputVarsConfig(templateName, applicationName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(dataSourceName, "name", applicationName),
+					resource.TestCheckResourceAttr(dataSourceName, "input_variables.#", "3"),
+				),
+			},
+		},
+	})
+
+}
+
 func testDataApplicationConfig(templateName, applicationName string) string {
 	return fmt.Sprintf(`%s
 
 data "hcp_waypoint_application" "test" {
   name    = hcp_waypoint_application.test.name
 }`, testApplicationConfig(templateName, applicationName))
 }
+
+func testDataApplicationWithInputVarsConfig(templateName, applicationName string) string {
+	return fmt.Sprintf(`%s
+
+data "hcp_waypoint_application" "test_var_opts" {
+  name    = hcp_waypoint_application.test_var_opts.name
+}`, testApplicationWithInputVarsConfig(templateName, applicationName))
+}