Skip to content

Commit a7a2b6f

Browse files
kcantrelkcantrel
authored
Merge branch 'main' into add_ubuntu_support
2 parents eb9de43 + d5efe30 commit a7a2b6f

21 files changed

Lines changed: 609 additions & 44 deletions

‎.github/workflows/actionlint.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,18 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21+
- name: Harden the runner (Audit all outbound calls)
22+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
23+
with:
24+
egress-policy: audit
25+
2126
- name: Checkout code
22-
uses: actions/checkout@v4
27+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2328
with:
2429
fetch-depth: 0
2530

2631
- name: Super-linter
27-
uses: super-linter/super-linter@v5.7.2 # x-release-please-version
32+
uses: super-linter/super-linter@a8150b40c89574adb5f68bf9502b890a236a06b3 # v5.7.2
2833
env:
2934
DEFAULT_BRANCH: main
3035
# To report GitHub Actions status checks, you must provide a GitHub token.

‎.github/workflows/dependency-review.yml‎

100755100644
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,15 @@ jobs:
2727
dependency-review:
2828
runs-on: ubuntu-latest
2929
steps:
30+
- name: Harden the runner (Audit all outbound calls)
31+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
32+
with:
33+
egress-policy: audit
34+
3035
- name: 'Checkout repository'
31-
uses: actions/checkout@v4
36+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
3237
- name: 'Dependency Review'
33-
uses: actions/dependency-review-action@v4
38+
uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
3439
# Commonly enabled options, see https://github.com/actions/dependency-review-action#configuration-options for all available options.
3540
with:
3641
comment-summary-in-pr: always

‎.github/workflows/terraform-docs.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,18 @@ jobs:
2323
- 'Infrastructure_as_Code/Terraform/deploy-fsx-ontap/module'
2424
- 'Infrastructure_as_Code/Terraform/deploy-fsx-ontap/standalone-module'
2525
steps:
26+
- name: Harden the runner (Audit all outbound calls)
27+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
28+
with:
29+
egress-policy: audit
30+
2631
- name: Checkout pull request
27-
uses: actions/checkout@v3.5.0
32+
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
2833
with:
2934
ref: ${{ github.event.pull_request.head.ref }}
3035

3136
- name: Render documentation and push changes back to branch
32-
uses: terraform-docs/gh-actions@v1.0.0
37+
uses: step-security/terraform-docs-action@863375b3d57d153d9cb47f73abcc2d4d3d00c101 # v1.4.5
3338
with:
3439
working-dir: ${{ matrix.directory }}
3540
config-file: ".terraform-docs.yml"

‎.github/workflows/terraform.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,19 @@ jobs:
2828
working-directory: ${{ matrix.directory }}
2929

3030
steps:
31+
- name: Harden the runner (Audit all outbound calls)
32+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
33+
with:
34+
egress-policy: audit
35+
3136
- name: Checkout pull request
32-
uses: actions/checkout@v3.5.0
37+
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
3338
with:
3439
fetch-depth: 0
3540
ref: ${{ github.event.pull_request.head.ref }}
3641

3742
- name: Set up Terraform
38-
uses: hashicorp/setup-terraform@v1
43+
uses: hashicorp/setup-terraform@ed3a0531877aca392eb870f440d9ae7aba83a6bd # v1.4.0
3944
with:
4045
terraform_wrapper: false
4146
terraform_version: 1.6.6

‎.github/workflows/update-CloudformationTemplate-FSxN-report.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@ jobs:
2323
contents: write
2424

2525
steps:
26+
- name: Harden the runner (Audit all outbound calls)
27+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
28+
with:
29+
egress-policy: audit
30+
2631
- name: Checkout pull request
27-
uses: actions/checkout@v4
32+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2833
with:
2934
ref: ${{ github.event.pull_request.head.ref }}
3035

@@ -34,4 +39,4 @@ jobs:
3439
run: ./update_fsxn_report_CF_template
3540

3641
- name: Commit the changes
37-
uses: stefanzweifel/git-auto-commit-action@v5
42+
uses: step-security/git-auto-commit-action@905c3cd6e9ed2b67b4d46ff401fdb6d745d0ff9d # v7.1.0

‎.github/workflows/update-CloudformationTemplate-auto-add-cw-alarms.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@ jobs:
2323
contents: write
2424

2525
steps:
26+
- name: Harden the runner (Audit all outbound calls)
27+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
28+
with:
29+
egress-policy: audit
30+
2631
- name: Checkout pull request
27-
uses: actions/checkout@v4
32+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2833
with:
2934
ref: ${{ github.event.pull_request.head.ref }}
3035

@@ -34,4 +39,4 @@ jobs:
3439
run: ./update-auto-add-cw-alarms-CF-Template
3540

3641
- name: Commit the changes
37-
uses: stefanzweifel/git-auto-commit-action@v5
42+
uses: step-security/git-auto-commit-action@905c3cd6e9ed2b67b4d46ff401fdb6d745d0ff9d # v7.1.0

‎.github/workflows/update-CloudformationTemplate-auto-set-fsxn-auto-grow.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@ jobs:
2323
contents: write
2424

2525
steps:
26+
- name: Harden the runner (Audit all outbound calls)
27+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
28+
with:
29+
egress-policy: audit
30+
2631
- name: Checkout pull request
27-
uses: actions/checkout@v4
32+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2833
with:
2934
ref: ${{ github.event.pull_request.head.ref }}
3035

@@ -34,4 +39,4 @@ jobs:
3439
run: ./update_auto_set_fsxn_auto_grow_CF_Template
3540

3641
- name: Commit the changes
37-
uses: stefanzweifel/git-auto-commit-action@v5
42+
uses: step-security/git-auto-commit-action@905c3cd6e9ed2b67b4d46ff401fdb6d745d0ff9d # v7.1.0

‎.github/workflows/update-CloudformationTemplate.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@ jobs:
2323
contents: write
2424

2525
steps:
26+
- name: Harden the runner (Audit all outbound calls)
27+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
28+
with:
29+
egress-policy: audit
30+
2631
- name: Checkout pull request
27-
uses: actions/checkout@v4
32+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2833
with:
2934
ref: ${{ github.event.pull_request.head.ref }}
3035

@@ -34,4 +39,4 @@ jobs:
3439
run: ./updateMonOntapServiceCFTemplate
3540

3641
- name: Commit the changes
37-
uses: stefanzweifel/git-auto-commit-action@v5
42+
uses: step-security/git-auto-commit-action@905c3cd6e9ed2b67b4d46ff401fdb6d745d0ff9d # v7.1.0

‎Infrastructure_as_Code/Ansible/Volume_Management/README.md‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ node to have network connectivity to the FSx for ONTAP file system. For more inf
77
Workload Factory Link, please refer to the [NetApp Workload Factory documentation](https://docs.netapp.com/us-en/workload-fsx-ontap/links-overview.html).
88

99
The list of playbooks included in this folder is as follows:
10-
- create\_volume.yaml
11-
- delete\_volume.yaml
1210
- create\_snapshot.yaml
1311
- delete\_snapshot.yaml
12+
- create\_volume.yaml
13+
- delete\_volume.yaml
14+
- create\_volume\_and\_share.yaml
15+
- delete\_volume\_and\_share.yaml
1416

1517
## Requirements
1618
- Ansible 2.9 or later. Installation instructions can be found [here](https://docs.ansible.com/ansible/latest/installation_guide/index.html)
@@ -28,11 +30,11 @@ Each playbook requires various variables to be set in order to run.
2830
| volume\_name| All | Yes | None | The name of the volume you want to act on.|
2931
| lambda\_function\_name| All | No | None | The name of the Workload Factory Link Lambda function to use when issuing API calls to the FSx for ONTAP file system.|
3032
| aws\_region | All | No | None | The AWS region where the Lambda function resides.|
31-
| volume\_size| create\_volume | Yes | None | The size, in MiBs, of the volume to create.|
32-
| security\_style | create\_volume | No | UNIX | The security style to use when creating the volume. Valid options are UNIX or NTFS.|
33-
| aggr | create\_volume | No | aggr1 | The name of the aggregate to create the volume on.|
34-
| volume\_type | create\_volume | No | RW | The type of volume to create. Valid options are RW and DP.|
35-
| junction\_path | create\_volume | No | `/<volume_name>` | The junction path to use when creating the volume.|
33+
| volume\_size| create\_volume\* | Yes | None | The size, in MiBs, of the volume to create.|
34+
| security\_style | create\_volume\* | No | UNIX | The security style to use when creating the volume. Valid options are UNIX or NTFS.|
35+
| aggr | create\_volume\* | No | aggr1 | The name of the aggregate to create the volume on.|
36+
| volume\_type | create\_volume\* | No | RW | The type of volume to create. Valid options are RW and DP.|
37+
| junction\_path | create\_volume\* | No | `/<volume_name>` | The junction path to use when creating the volume.|
3638
| snapshot\_name | create\_snapshot | Yes | None | The name of the snapshot to create.|
3739

3840
A convenient way to set all the required variable is to put them into a file named `variables.yaml`.

‎Infrastructure_as_Code/Ansible/Volume_Management/create_volume.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222
- volume_size
2323
- vserver
2424
- secret_name
25+
- fsxn_hostname
2526
#
2627
# Give default values to optional variables if they are not defined
27-
- name: Set security_style to unix if not provide.
28+
- name: Set security_style to unix if not provided.
2829
set_fact:
2930
security_style: "unix"
3031
when: security_style is not defined
@@ -44,7 +45,7 @@
4445
use_lambda: true
4546
when: lambda_function_name is defined
4647

47-
- name: Set aws_provide to "default" if not provided.
48+
- name: Set aws_profile to "default" if not provided.
4849
set_fact:
4950
aws_profile: "default"
5051
when: aws_profile is not defined
@@ -83,6 +84,7 @@
8384
vserver: "{{ vserver }}"
8485
aggregate_name: "{{ aggr }}"
8586
junction_path: "{{ junction_path }}"
87+
volume_security_style: "{{ security_style }}"
8688
use_lambda: "{{ use_lambda }}"
8789
lambda_config:
8890
aws_profile: "{{ aws_profile }}"

0 commit comments

Comments
 (0)