Skip to content

Commit

Permalink
Merge latest main and update tenant_project_variable
Browse files Browse the repository at this point in the history
  • Loading branch information
IsaacCalligeros95 committed Aug 6, 2024
1 parent a10fd91 commit 472b7ac
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 35 deletions.
5 changes: 4 additions & 1 deletion docs/data-sources/environments.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Required:
Optional:

- `allow_dynamic_infrastructure` (Boolean)
- `description` (String) The description of this environment.
- `id` (String) The unique ID for this resource.
- `jira_extension_settings` (Attributes List) Provides extension settings for the Jira integration for this environment. (see [below for nested schema](#nestedatt--environments--jira_extension_settings))
- `jira_service_management_extension_settings` (Attributes List) Provides extension settings for the Jira Service Management (JSM) integration for this environment. (see [below for nested schema](#nestedatt--environments--jira_service_management_extension_settings))
Expand All @@ -56,6 +55,10 @@ Optional:
- `space_id` (String) The space ID associated with this environment.
- `use_guided_failure` (Boolean)

Read-Only:

- `description` (String) The description of this environment.

<a id="nestedatt--environments--jira_extension_settings"></a>
### Nested Schema for `environments.jira_extension_settings`

Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/git_credentials.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ A list of Git Credentials that match the filter(s).

Optional:

- `description` (String) The description of this Git Credential.
- `id` (String) The unique ID for this resource.
- `name` (String) A filter search by exact name
- `space_id` (String) The space ID associated with this Git Credential.

Read-Only:

- `description` (String) The description of this Git Credential.
- `type` (String) The Git credential authentication type.
- `username` (String) The username for the Git credential.

Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/lifecycles.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ Required:

Optional:

- `description` (String) The description of this lifecycle.
- `id` (String) The unique ID for this resource.
- `space_id` (String) The space ID associated with this lifecycle.

Read-Only:

- `description` (String) The description of this lifecycle.
- `phase` (Attributes List) (see [below for nested schema](#nestedatt--lifecycles--phase))
- `release_retention_policy` (Attributes List) (see [below for nested schema](#nestedatt--lifecycles--release_retention_policy))
- `tentacle_retention_policy` (Attributes List) (see [below for nested schema](#nestedatt--lifecycles--tentacle_retention_policy))
Expand Down
19 changes: 8 additions & 11 deletions docs/resources/tenant_common_variable.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
page_title: "octopusdeploy_tenant_common_variable Resource - terraform-provider-octopusdeploy"
subcategory: ""
description: |-
This resource manages tenant common variables in Octopus Deploy.
Manages a tenant common variable in Octopus Deploy.
---

# octopusdeploy_tenant_common_variable (Resource)

This resource manages tenant common variables in Octopus Deploy.
Manages a tenant common variable in Octopus Deploy.



Expand All @@ -17,17 +17,14 @@ This resource manages tenant common variables in Octopus Deploy.

### Required

- `library_variable_set_id` (String)
- `template_id` (String)
- `tenant_id` (String)
- `library_variable_set_id` (String) The ID of the library variable set.
- `template_id` (String) The ID of the variable template.
- `tenant_id` (String) The ID of the tenant.

### Optional

- `space_id` (String)
- `value` (String, Sensitive)

### Read-Only

- `id` (String) The ID of this resource.
- `id` (String) The unique ID for this resource.
- `space_id` (String) The space ID associated with this Tenant Common Variable.
- `value` (String, Sensitive) The value of the variable.


13 changes: 5 additions & 8 deletions docs/resources/tenant_project.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
page_title: "octopusdeploy_tenant_project Resource - terraform-provider-octopusdeploy"
subcategory: ""
description: |-
This resource represents the connection between tenants and projects.
---

# octopusdeploy_tenant_project (Resource)

This resource represents the connection between tenants and projects.




Expand All @@ -22,11 +22,8 @@ This resource represents the connection between tenants and projects.

### Optional

- `environment_ids` (List of String) The environment ID associated with this tenant.
- `space_id` (String) The space ID associated with this resource.

### Read-Only

- `id` (String) The ID of this resource.
- `environment_ids` (List of String) The environment IDs associated with this tenant.
- `id` (String) The unique ID for this resource.
- `space_id` (String) The space ID associated with this project tenant.


21 changes: 9 additions & 12 deletions docs/resources/tenant_project_variable.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
page_title: "octopusdeploy_tenant_project_variable Resource - terraform-provider-octopusdeploy"
subcategory: ""
description: |-
This resource manages tenant project variables in Octopus Deploy.
Manages a tenant project variable in Octopus Deploy.
---

# octopusdeploy_tenant_project_variable (Resource)

This resource manages tenant project variables in Octopus Deploy.
Manages a tenant project variable in Octopus Deploy.



Expand All @@ -17,18 +17,15 @@ This resource manages tenant project variables in Octopus Deploy.

### Required

- `environment_id` (String)
- `project_id` (String)
- `template_id` (String)
- `tenant_id` (String)
- `environment_id` (String) The ID of the environment.
- `project_id` (String) The ID of the project.
- `template_id` (String) The ID of the variable template.
- `tenant_id` (String) The ID of the tenant.

### Optional

- `space_id` (String)
- `value` (String, Sensitive)

### Read-Only

- `id` (String) The ID of this resource.
- `id` (String) The unique ID for this resource.
- `space_id` (String) The space ID associated with this Tenant Project Variable.
- `value` (String, Sensitive) The value of the variable.


2 changes: 1 addition & 1 deletion octopusdeploy_framework/schemas/tenant_project_variable.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func GetTenantProjectVariableResourceSchema() schema.Schema {
"environment_id": util.GetRequiredStringResourceSchema("The ID of the environment."),
"template_id": util.GetRequiredStringResourceSchema("The ID of the variable template."),
"value": schema.StringAttribute{
Required: true,
Optional: true,
Description: "The value of the variable.",
Sensitive: true,
},
Expand Down

0 comments on commit 472b7ac

Please sign in to comment.