Skip to content

Commit d9e3a07

Browse files
authored
Release prep (#119)
* Cleanup code for release * Update release version documentation
1 parent a9f40e4 commit d9e3a07

File tree

76 files changed

+702
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+702
-229
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
## UNRELEASED
22

3+
## 0.9.1 (May 12, 2023)
4+
35
NOTES:
46

7+
* The `morpheus-sdk` dependcy has been upgraded to version 0.3.3.
58
* Updated the `morpheus_task_job` resource to properly read all object attributes. [#113](https://github.com/gomorpheus/terraform-provider-morpheus/issues/113)
69
* Updated the `morpheus_task_job` resource to add support for labels and support the new dynamic automation targeting feature in which instance or server labels can be used for the target selection.
10+
* Add label support for automation task and workflow resources (i.e - provisioning workflow, ansible playbook task, python script task, etc).
11+
* Add label support for option list resources.
712

813
FEATURES:
914

1015
* **New Resource:** `morpheus_resource_pool_group`
1116
* **New Resource:** `morpheus_license`
17+
* **New Resource:** `morpheus_key_pair`
1218

1319
## 0.9.0 (April 26, 2023)
1420

docs/data-sources/key_pair.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ data "morpheus_key_pair" "tf_example_key_pair" {
2323
### Optional
2424

2525
- `id` (Number) The ID of the key pair
26-
- `name` (String) The name of the integration
26+
- `name` (String) The name of the integration
27+
- `publickey` (String) PublicKey of the KeyPair

docs/data-sources/virtual_image.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ data "morpheus_virtual_image" "example_virtual_image" {
2222

2323
### Optional
2424

25+
- `imagetype` (String) The type of the Morpheus virtual image (alibaba,ami,azure-reference,digitalocean,oci,pxe,iso,qcow2,raw,vhd,vmdk).
2526
- `name` (String) The name of the Morpheus virtual image.
2627

2728
### Read-Only

docs/resources/ansible_playbook_task.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Provides a Morpheus ansible playbook task resource
1515
resource "morpheus_ansible_playbook_task" "ansplaybook" {
1616
name = "tfansibletest"
1717
code = "tfansibletest"
18+
labels = ["demo", "terraform"]
1819
ansible_repo_id = "5"
1920
git_ref = "master"
2021
playbook = "mongo_install"
@@ -45,6 +46,7 @@ resource "morpheus_ansible_playbook_task" "ansplaybook" {
4546
- `command_options` (String) Additional commands options to pass during the execution of the ansible playbook
4647
- `execute_target` (String) The target that the ansible playbook will be executed on
4748
- `git_ref` (String) The git reference of the ansible repo to pull (main, master, etc.)
49+
- `labels` (Set of String) The organization labels associated with the task (Only supported on Morpheus 5.5.3 or higher)
4850
- `retry_count` (Number) The number of times to retry the task if there is a failure
4951
- `retry_delay_seconds` (Number) The number of seconds to wait between retry attempts
5052
- `retryable` (Boolean) Whether to retry the task if there is a failure

docs/resources/api_option_list.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ resource "morpheus_api_option_list" "tf_example_api_option_list" {
3737
### Optional
3838

3939
- `description` (String) The description of the option list
40-
- `option_list` (String) The Morpheus object option list
40+
- `labels` (Set of String) The organization labels associated with the option list (Only supported on Morpheus 5.5.3 or higher)
41+
- `option_list` (String) The Morpheus object option list (clouds, instanceTypeClouds, environments, groups, instances, instance-wiki, networks, instanceNetworks, servicePlans, resourcePools, securityGroups, servers, server-wiki)
4142
- `request_script` (String) A js script to manipulate the request payload.
4243
- `translation_script` (String) A js script to translate the result data object into an Array containing objects with properties 'name’ and 'value’.
4344
- `visibility` (String) Whether the option list is visible in sub-tenants or not

docs/resources/email_task.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Creating the email task with local email template content:
1717
resource "morpheus_email_task" "tfexample_email" {
1818
name = "tfexample_email"
1919
code = "tfexample_email"
20+
labels = ["demo", "terraform"]
2021
email_address = "<%=instance.createdByEmail%>"
2122
subject = "<%=instance.hostname%> provisioning complete"
2223
source = "local"
@@ -35,6 +36,7 @@ Creating the email task with the email template fetched from a url:
3536
resource "morpheus_email_task" "tfexample_email_url" {
3637
name = "tfexample_email_url"
3738
code = "tfexample_email_url"
39+
labels = ["demo", "terraform"]
3840
email_address = "<%=instance.createdByEmail%>"
3941
subject = "<%=instance.hostname%> provisioning complete"
4042
source = "url"
@@ -53,6 +55,7 @@ Creating the email task with the email template fetched via git:
5355
resource "morpheus_email_task" "tfexample_email_git" {
5456
name = "tfexample_email_git"
5557
code = "tfexample_email_git"
58+
labels = ["demo", "terraform"]
5659
email_address = "<%=instance.createdByEmail%>"
5760
subject = "<%=instance.hostname%> provisioning complete"
5861
source = "repository"
@@ -83,6 +86,7 @@ resource "morpheus_email_task" "tfexample_email_git" {
8386
- `content` (String) The body of the email is HTML. Morpheus automation variables can be injected into the email body when needed. Used with a source type of local
8487
- `content_path` (String) The file path of the template used for the email task, used with a source type of repository
8588
- `content_url` (String) The URL of the template used for the email task, used with a source type of url
89+
- `labels` (Set of String) The organization labels associated with the task (Only supported on Morpheus 5.5.3 or higher)
8690
- `repository_id` (Number) The ID of the git repository to fetch the email template
8791
- `retry_count` (Number) The number of times to retry the task if there is a failure
8892
- `retry_delay_seconds` (Number) The number of seconds to wait between retry attempts

docs/resources/groovy_script_task.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Creating the groovy script task with local script content:
1717
resource "morpheus_groovy_script_task" "tfexample_groovy_local" {
1818
name = "tfexample_groovy_local"
1919
code = "tfexample_groovy_local"
20+
labels = ["demo", "terraform"]
2021
source_type = "local"
2122
script_content = <<EOF
2223
println "hello"
@@ -34,6 +35,7 @@ Creating the groovy script task with the script fetched from a url:
3435
resource "morpheus_groovy_script_task" "tfexample_groovy_url" {
3536
name = "tfexample_groovy_url"
3637
code = "tfexample_groovy_url"
38+
labels = ["demo", "terraform"]
3739
source_type = "url"
3840
result_type = "json"
3941
script_path = "https://example.com/example.groovy"
@@ -50,6 +52,7 @@ Creating the groovy script task with the script fetch via git:
5052
resource "morpheus_groovy_script_task" "tfexample_groovy_git" {
5153
name = "tfexample_groovy_git"
5254
code = "tfexample_groovy_git"
55+
labels = ["demo", "terraform"]
5356
source_type = "repository"
5457
result_type = "json"
5558
script_path = "example.groovy"
@@ -74,6 +77,7 @@ resource "morpheus_groovy_script_task" "tfexample_groovy_git" {
7477

7578
- `allow_custom_config` (Boolean) Custom configuration data to pass during the execution of the groovy script
7679
- `code` (String) The code of the groovy script task
80+
- `labels` (Set of String) The organization labels associated with the task (Only supported on Morpheus 5.5.3 or higher)
7781
- `repository_id` (Number) The ID of the git repository integration
7882
- `result_type` (String) The expected result type (single value, key pairs, json)
7983
- `retry_count` (Number) The number of times to retry the task if there is a failure

docs/resources/javascript_task.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Provides a Morpheus javascript task resource
1515
resource "morpheus_javascript_task" "tfexample_javascript" {
1616
name = "tfexample_javascript"
1717
code = "tfexample_javascript"
18+
labels = ["demo", "terraform"]
1819
script_content = <<EOF
1920
console.log("testing")
2021
EOF
@@ -36,6 +37,7 @@ EOF
3637

3738
- `allow_custom_config` (Boolean) Custom configuration data to pass during the execution of the javascript script
3839
- `code` (String) The code of the javascript script task
40+
- `labels` (Set of String) The organization labels associated with the task (Only supported on Morpheus 5.5.3 or higher)
3941
- `result_type` (String) The expected result type (single value, key pairs, json)
4042
- `retry_count` (Number) The number of times to retry the task if there is a failure
4143
- `retry_delay_seconds` (Number) The number of seconds to wait between retry attempts

docs/resources/key_pair.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
page_title: "morpheus_key_pair Resource - terraform-provider-morpheus"
3+
subcategory: ""
4+
description: |-
5+
Provides a Morpheus key pair resource.
6+
---
7+
8+
# morpheus_license
9+
10+
Provides a Morpheus key pair resource.
11+
12+
## Example Usage
13+
14+
```terraform
15+
resource "morpheus_key_pair" "tf_example_key_pair" {
16+
name = "TF Example Key Pair"
17+
public_key = "ssh-rsa AAAAB3Nz"
18+
private_key = file("privatekey.rsa")
19+
passphrase = "12312"
20+
}
21+
```
22+
23+
<!-- schema generated by tfplugindocs -->
24+
## Schema
25+
26+
### Required
27+
28+
- `name` (String) Name of the key pair
29+
- `public_key` (String) The public key of the key pair
30+
31+
### Optional
32+
33+
- `passphrase` (String, Sensitive) The passphrase for the private key of the key pair
34+
- `private_key` (String, Sensitive) The private key of the key pair
35+
36+
### Read-Only
37+
38+
- `id` (String) The ID of the key pair
39+
40+
## Import
41+
42+
Import is supported using the following syntax:
43+
44+
```shell
45+
terraform import morpheus_key_pair.tf_example_key_pair 1
46+
```

docs/resources/manual_option_list.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ POLICY
3636

3737
- `dataset` (String) The dataset for the manual option list
3838
- `description` (String) The description of the option list
39+
- `labels` (Set of String) The organization labels associated with the option list (Only supported on Morpheus 5.5.3 or higher)
3940
- `real_time` (Boolean) Whether the list is refreshed every time an associated option type is requested
4041
- `translation_script` (String) A js script to translate the result data object into an Array containing objects with properties 'name’ and 'value’.
4142
- `visibility` (String) Whether the option list is visible in sub-tenants or not

0 commit comments

Comments
 (0)