Skip to content

Commit dd83e08

Browse files
hughwphamillhughwphamill
committed
Support internal and public NAT rules
1 parent 63f24d4 commit dd83e08

File tree

42 files changed

+477
-287
lines changed

Some content is hidden

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

42 files changed

+477
-287
lines changed

‎.github/workflows/release.yml

+6-11
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,24 @@ on:
1717
jobs:
1818
goreleaser:
1919
permissions:
20-
contents: write
20+
contents: write
2121
runs-on: ubuntu-latest
2222
steps:
23-
-
24-
name: Checkout
23+
- name: Checkout
2524
uses: actions/checkout@v3
26-
-
27-
name: Unshallow
25+
- name: Unshallow
2826
run: git fetch --prune --unshallow
29-
-
30-
name: Set up Go
27+
- name: Set up Go
3128
uses: actions/setup-go@v2
3229
with:
3330
go-version: 1.18
34-
-
35-
name: Import GPG key
31+
- name: Import GPG key
3632
id: import_gpg
3733
uses: crazy-max/[email protected]
3834
with:
3935
gpg_private_key: ${{ secrets.TERRAFORM_GPG_PRIVATE_KEY }}
4036
passphrase: ${{ secrets.TERRAFORM_GPG_PASSPHRASE }}
41-
-
42-
name: Run GoReleaser
37+
- name: Run GoReleaser
4338
uses: goreleaser/[email protected]
4439
with:
4540
version: latest

‎.vscode/launch.json

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
2-
// Use IntelliSense to learn about possible attributes.
3-
// Hover to view descriptions of existing attributes.
4-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5-
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
"name": "Acceptance Tests",
9-
"type": "go",
10-
"request": "launch",
11-
"mode": "test",
12-
// this assumes your workspace is the root of the repo
13-
"program": "${fileDirname}",
14-
"env": {
15-
"TF_ACC": "1",
16-
},
17-
"args": [],
18-
},
19-
{
20-
"name": "Debug - Attach External CLI",
21-
"type": "go",
22-
"request": "launch",
23-
"mode": "debug",
24-
// this assumes your workspace is the root of the repo
25-
"program": "${workspaceFolder}",
26-
"env": {},
27-
"args": [
28-
// pass the debug flag for reattaching
29-
"-debug",
30-
],
31-
}
32-
]
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Acceptance Tests",
9+
"type": "go",
10+
"request": "launch",
11+
"mode": "test",
12+
// this assumes your workspace is the root of the repo
13+
"program": "${fileDirname}",
14+
"env": {
15+
"TF_ACC": "1"
16+
},
17+
"args": []
18+
},
19+
{
20+
"name": "Debug - Attach External CLI",
21+
"type": "go",
22+
"request": "launch",
23+
"mode": "debug",
24+
// this assumes your workspace is the root of the repo
25+
"program": "${workspaceFolder}",
26+
"env": {},
27+
"args": [
28+
// pass the debug flag for reattaching
29+
"-debug"
30+
]
31+
}
32+
]
3333
}

‎CONTRIBUTING.md

+21-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# How to Contribute
22

3-
Thank you for your interest in contributing to the dCloud Terraform Provider project! To ensure smooth collaboration and effective development, please review the following guidelines. By following these guidelines, you demonstrate respect for the time and efforts of the project's contributors. In return, they will reciprocate by addressing your issues, evaluating changes, and assisting with your pull requests. We strive to review incoming issues and pull requests within 10 days. Any lingering issues or pull requests inactive for 60 days will be closed.
3+
Thank you for your interest in contributing to the dCloud Terraform Provider project! To ensure smooth collaboration and
4+
effective development, please review the following guidelines. By following these guidelines, you demonstrate respect
5+
for the time and efforts of the project's contributors. In return, they will reciprocate by addressing your issues,
6+
evaluating changes, and assisting with your pull requests. We strive to review incoming issues and pull requests within
7+
10 days. Any lingering issues or pull requests inactive for 60 days will be closed.
48

5-
Please note that all interactions within the project are subject to our [Code of Conduct](/CODE_OF_CONDUCT.md). This applies to creating issues or pull requests, commenting on them, as well as any real-time discussions in platforms like Slack, Discord, etc.
9+
Please note that all interactions within the project are subject to our [Code of Conduct](/CODE_OF_CONDUCT.md). This
10+
applies to creating issues or pull requests, commenting on them, as well as any real-time discussions in platforms like
11+
Slack, Discord, etc.
612

713
## Table Of Contents
814

@@ -17,11 +23,15 @@ Please note that all interactions within the project are subject to our [Code of
1723

1824
## Reporting Issues
1925

20-
Before reporting a new issue, please search our [issues list](https://github.com/cisco-open/terraform-provider-dcloud/issues) to ensure that it hasn't already been reported or fixed.
26+
Before reporting a new issue, please search
27+
our [issues list](https://github.com/cisco-open/terraform-provider-dcloud/issues) to ensure that it hasn't already been
28+
reported or fixed.
2129

22-
When creating a new issue, include a clear title, a detailed description, relevant information, and if possible, a test case.
30+
When creating a new issue, include a clear title, a detailed description, relevant information, and if possible, a test
31+
case.
2332

24-
**If you discover a security vulnerability, please refrain from reporting it through GitHub. Instead, follow the security procedures outlined in [SECURITY.md](/SECURITY.md).**
33+
**If you discover a security vulnerability, please refrain from reporting it through GitHub. Instead, follow the
34+
security procedures outlined in [SECURITY.md](/SECURITY.md).**
2535

2636
## Development
2737

@@ -46,14 +56,17 @@ To run the example terraform definitions for the dCloud Terraform Provider, do t
4656

4757
1. Navigate to each example directory under `/examples`
4858
2. Execute `terraform init`
49-
3. Create an environment variable to hold your Cisco Authentication Token (use a valid token) `export TB_AUTH_TOKEN=abc123`
59+
3. Create an environment variable to hold your Cisco Authentication Token (use a valid
60+
token) `export TB_AUTH_TOKEN=abc123`
5061
4. Execute `terraform apply`
5162

5263
## Sending Pull Requests
5364

54-
Before submitting a new pull request, please check existing pull requests and issues to ensure that your proposed changes or fixes haven't been discussed in the past or already implemented but not released.
65+
Before submitting a new pull request, please check existing pull requests and issues to ensure that your proposed
66+
changes or fixes haven't been discussed in the past or already implemented but not released.
5567

56-
When submitting a pull request, include tests for any affected behavior. As we follow semantic versioning, breaking changes may be reserved for the next major version release.
68+
When submitting a pull request, include tests for any affected behavior. As we follow semantic versioning, breaking
69+
changes may be reserved for the next major version release.
5770

5871
## Other Ways to Contribute
5972

‎docs/data-sources/external_dns.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
page_title: "dcloud_external_dns Data Source - terraform-provider-dcloud"
44
subcategory: ""
55
description: |-
6-
All the dns records currently in a given topology
6+
All the External DNS rules in a given topology
77
---
88

99
# dcloud_external_dns (Data Source)
1010

11-
All the dns records currently in a given topology
11+
All the External DNS rules in a given topology
12+
1213

1314

1415
<!-- schema generated by tfplugindocs -->
@@ -20,30 +21,29 @@ All the dns records currently in a given topology
2021

2122
### Read-Only
2223

23-
- `id` (String) The ID of this resource.
2424
- `external_dns` (List of Object) (see [below for nested schema](#nestedatt--external_dns))
25+
- `id` (String) The ID of this resource.
2526

2627
<a id="nestedatt--external_dns"></a>
2728
### Nested Schema for `external_dns`
2829

2930
Read-Only:
3031

31-
- `uid` (String)
32-
- `topology_uid` (String)
32+
- `a_record` (String)
3333
- `hostname` (String)
3434
- `nat_rule_id` (String)
35-
- `a_record` (String)
3635
- `srv_records` (List of Object) (see [below for nested schema](#nestedobjatt--external_dns--srv_records))
37-
36+
- `topology_uid` (String)
37+
- `uid` (String)
3838

3939
<a id="nestedobjatt--external_dns--srv_records"></a>
4040
### Nested Schema for `external_dns.srv_records`
4141

4242
Read-Only:
4343

44+
- `port` (Number)
4445
- `protocol` (String)
4546
- `service` (String)
46-
- `port` (Int)
4747
- `uid` (String)
4848

4949

‎docs/data-sources/inbound_proxy_rules.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
page_title: "dcloud_inbound_proxy_rules Data Source - terraform-provider-dcloud"
44
subcategory: ""
55
description: |-
6-
All the Inbound Proxy rules currently in a given topology
6+
All the Inbound Proxy rules in a given topology
77
---
88

99
# dcloud_inbound_proxy_rules (Data Source)
1010

11-
All the Inbound Proxy rules currently in a given topology
11+
All the Inbound Proxy rules in a given topology
12+
1213

1314

1415
<!-- schema generated by tfplugindocs -->
@@ -28,15 +29,15 @@ All the Inbound Proxy rules currently in a given topology
2829

2930
Read-Only:
3031

31-
- `nic_uid` (String)
32+
- `hyperlink` (String)
3233
- `nic_ip_address` (String)
34+
- `nic_uid` (String)
35+
- `show_hyperlink` (Boolean)
36+
- `ssl` (Boolean)
3337
- `target_vm_name` (String)
34-
- `show_hypperlink` (Bool)
35-
- `ssl` (Bool)
36-
- `url_path` (String)
37-
- `hyperlink` (String)
38-
- `tcp_port` (Integer)
38+
- `tcp_port` (Number)
3939
- `topology_uid` (String)
4040
- `uid` (String)
41+
- `url_path` (String)
4142

4243

‎docs/data-sources/inventory_dns_assets.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
page_title: "dcloud_inventory_dns_assets Data Source - terraform-provider-dcloud"
44
subcategory: ""
55
description: |-
6-
All the inventory dns assets available to be used in a topology
6+
All the Inventory DNS assets in a given topology
77
---
88

99
# dcloud_inventory_dns_assets (Data Source)
1010

11-
All the inventory dns assets available to be used in a topology
11+
All the Inventory DNS assets in a given topology
1212

1313

1414

‎docs/data-sources/inventory_srv_protocols.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
page_title: "dcloud_inventory_srv_protocols Data Source - terraform-provider-dcloud"
44
subcategory: ""
55
description: |-
6-
All the inventory srv protocols available to be used in a topology
6+
All the Inventory SRV protocols in a given topology
77
---
88

99
# dcloud_inventory_srv_protocols (Data Source)
1010

11-
All the inventory srv protocols available to be used in a topology
11+
All the Inventory SRV protocols in a given topology
1212

1313

1414

1515
<!-- schema generated by tfplugindocs -->
1616
## Schema
1717

18-
1918
### Read-Only
2019

2120
- `id` (String) The ID of this resource.

‎docs/data-sources/inventory_telephony.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
page_title: "dcloud_inventory_telephony Data Source - terraform-provider-dcloud"
44
subcategory: ""
55
description: |-
6-
All the inventory telephony available to be used in a topology
6+
All the inventory Telephony Items available to be used in a topology
77
---
88

99
# dcloud_inventory_telephony (Data Source)
1010

11-
All the inventory telephony available to be used in a topology
11+
All the inventory Telephony Items available to be used in a topology
1212

1313

1414

@@ -29,8 +29,8 @@ All the inventory telephony available to be used in a topology
2929

3030
Read-Only:
3131

32+
- `description` (String)
3233
- `id` (String)
3334
- `name` (String)
34-
- `description` (String)
3535

3636

‎docs/data-sources/ip_nat_rules.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
page_title: "dcloud_ip_nat_rules Data Source - terraform-provider-dcloud"
44
subcategory: ""
55
description: |-
6-
All the IP Nat rules currently in a given topology
6+
All the IP Nat rules in a given topology
77
---
88

99
# dcloud_ip_nat_rules (Data Source)
1010

11-
All the IP Nat rules currently in a given topology
11+
All the IP Nat rules in a given topology
12+
1213

1314

1415
<!-- schema generated by tfplugindocs -->
@@ -28,9 +29,10 @@ All the IP Nat rules currently in a given topology
2829

2930
Read-Only:
3031

32+
- `east_west` (Boolean)
33+
- `scope` (String)
3134
- `target_ip_address` (String)
3235
- `target_name` (String)
33-
- `east_west` (Bool)
3436
- `topology_uid` (String)
3537
- `uid` (String)
3638

‎docs/data-sources/mail_servers.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
page_title: "dcloud_mail_servers Data Source - terraform-provider-dcloud"
44
subcategory: ""
55
description: |-
6-
All the Mail servers currently in a given topology
6+
All the Mail Servers in a given topology
77
---
88

99
# dcloud_mail_servers (Data Source)
1010

11-
All the Mail servers currently in a given topology
11+
All the Mail Servers in a given topology
12+
1213

1314

1415
<!-- schema generated by tfplugindocs -->
@@ -21,16 +22,16 @@ All the Mail servers currently in a given topology
2122
### Read-Only
2223

2324
- `id` (String) The ID of this resource.
24-
- `mail-servers` (List of Object) (see [below for nested schema](#nestedatt--mail-servers))
25+
- `mail_servers` (List of Object) (see [below for nested schema](#nestedatt--mail_servers))
2526

26-
<a id="nestedatt--mail-servers"></a>
27-
### Nested Schema for `mail-servers`
27+
<a id="nestedatt--mail_servers"></a>
28+
### Nested Schema for `mail_servers`
2829

2930
Read-Only:
3031

31-
- `nic_uid` (String)
3232
- `dns_asset_id` (String)
3333
- `dns_asset_name` (String)
34+
- `nic_uid` (String)
3435
- `topology_uid` (String)
3536
- `uid` (String)
3637

0 commit comments

Comments
 (0)