Skip to content

Commit d5b21b9

Browse files
committed
Merge branch 'integration/main' of https://github.com/NetApp/terraform-provider-netapp-ontap into 256-enhancement-netapp-ontap_aggregate
2 parents c618883 + 103d0d5 commit d5b21b9

24 files changed

Lines changed: 261 additions & 78 deletions

.github/workflows/blackduck.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,33 @@ on:
1111
- "release*"
1212

1313
jobs:
14-
build:
14+
validate-version:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
20+
- name: Get Latest Release Version
21+
id: get_latest_release
22+
run: |
23+
LATEST_RELEASE=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r '.tag_name' | sed 's/^v//')
24+
echo "Latest release: $LATEST_RELEASE"
25+
echo "LATEST_RELEASE=${LATEST_RELEASE}" >> $GITHUB_ENV
1526
27+
- name: Validate DETECT_PROJECT_VERSION_NAME
28+
id: validate_version
29+
run: |
30+
LATEST_VERSION=${LATEST_RELEASE}
31+
CURRENT_VERSION=$(grep -oP 'DETECT_PROJECT_VERSION_NAME=\K.*' scripts/bd_scan.bash)
32+
echo "Latest version released: $LATEST_VERSION"
33+
echo "Current version for scanning: $CURRENT_VERSION"
34+
if [ "$(printf '%s\n' "$LATEST_VERSION" "$CURRENT_VERSION" | sort -V | tail -n 1)" == "$LATEST_VERSION" ]; then
35+
echo "Error: DETECT_PROJECT_VERSION_NAME ($CURRENT_VERSION) must be greater than the latest release version ($LATEST_VERSION) in bd_scan.sh script."
36+
exit 1
37+
fi
38+
39+
build:
40+
needs: validate-version
1641
runs-on: self-hosted
1742
steps:
1843
- uses: actions/setup-java@v4
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Check for Missing Documentation
2+
3+
on:
4+
push:
5+
branches:
6+
- "integration/main"
7+
- "release*"
8+
pull_request:
9+
branches:
10+
- "integration/main"
11+
- "release*"
12+
13+
jobs:
14+
build:
15+
16+
runs-on: self-hosted
17+
steps:
18+
- name: Checkout code
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
23+
- name: Check for missing .md files
24+
run: |
25+
MISSING_DOCS=""
26+
RESOURCE_FILES=$(find . -type f -name '*_resource.go')
27+
DATA_SOURCE_FILES=$(find . -type f -name '*_data_source.go')
28+
29+
for FILE in $RESOURCE_FILES; do
30+
if [[ "$FILE" == *example_resource.go ]] || [[ "$FILE" == *tag_prefix_resource.go ]]; then
31+
continue
32+
fi
33+
DOC_FILE="${FILE##*/}"
34+
DOC_FILE="${DOC_FILE/_resource.go/.md}"
35+
DOC_FILE="${DOC_FILE/protocols_/}"
36+
DOC_FILE="${DOC_FILE/storage_/}"
37+
DOC_FILE="docs/resources/$DOC_FILE"
38+
if [ ! -f "$DOC_FILE" ]; then
39+
MISSING_DOCS="$MISSING_DOCS\n$DOC_FILE"
40+
fi
41+
done
42+
43+
for FILE in $DATA_SOURCE_FILES; do
44+
if [[ "$FILE" == *example_data_source.go ]] || [[ "$FILE" == *tag_prefix_data_source.go ]] || [[ "$FILE" == *tag_all_prefix_data_source.go ]]; then
45+
continue
46+
fi
47+
DOC_FILE="${FILE##*/}"
48+
DOC_FILE="${DOC_FILE/_data_source.go/.md}"
49+
DOC_FILE="${DOC_FILE/protocols_/}"
50+
DOC_FILE="${DOC_FILE/storage_/}"
51+
DOC_FILE="docs/data-sources/$DOC_FILE"
52+
if [ ! -f "$DOC_FILE" ]; then
53+
MISSING_DOCS="$MISSING_DOCS\n$DOC_FILE"
54+
fi
55+
done
56+
57+
if [ -n "$MISSING_DOCS" ]; then
58+
printf "The following documentation files are missing:%b\n" "$MISSING_DOCS"
59+
exit 1
60+
else
61+
echo "All resource and data source files have corresponding documentation."
62+
fi

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ ENHANCEMENTS:
99
BUG FIXES:
1010

1111
- **netapp-ontap_svm_qos_policy_activation**: ID parameter missing in QOS policy ([#429](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/429))
12+
- **netapp-ontap_security_account**: password, comment and locked parameters not passed into body request for creating account ([#462](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/462))
13+
- **netapp-ontap_security_account**: fixed inconsistency plan changes when re-run with terraform apply ([#465](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/465))
14+
- Corrected Resource and Data Source documentation Names ([#441](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/441))
15+
- **netapp-ontap_svm_qos_policy_activation**: Renamed documentation from `svm_qos_policy_activation_resource` to `svm_qos_policy_activation` ([#430](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/430))
16+
- **netapp-ontap_cifs_service**: Fixed no resource state after creation by modifying the "kdc_encrytion" version check and also idempotency issue with CIFS server name([#367](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/367))
1217

1318
# 2.1.1 (2025-02-26)
1419

File renamed without changes.

docs/data-sources/networking_broadcast_domains_data_source.md renamed to docs/data-sources/network_broadcast_domains.md

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)