Merge branch 'main' into chore/dry-acceptance-test-config

Author: blakepettersson

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+      uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+      uses: github/codeql-action/autobuild@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+      uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8

docs/resources/application.md

@@ -559,8 +559,10 @@ Read-Only:
 
 Import is supported using the following syntax:
 
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
+
 ```shell
-# ArgoCD applications can be imported using an id consisting of `{name}:{namespace}`. E.g.
+# ArgoCD applications can be imported using an id consisting of `{name}:{namespace}`.
 
 terraform import argocd_application.myapp myapp:argocd
 ```

docs/resources/cluster.md

@@ -215,9 +215,10 @@ Read-Only:
 
 Import is supported using the following syntax:
 
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
+
 ```shell
 # Cluster credentials can be imported using the server URL.
 
-# Example:
 terraform import argocd_cluster.mycluster https://mycluster.io:443
 ```

docs/resources/gpg_key.md

@@ -67,9 +67,10 @@ EOF
 
 Import is supported using the following syntax:
 
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
+
 ```shell
 # GPG Keys can be imported using the key ID.
 
-# Example:
 terraform import argocd_gpg_key.this 9AD92955401D388D
 ```

docs/resources/project.md

@@ -295,9 +295,10 @@ Optional:
 
 Import is supported using the following syntax:
 
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
+
 ```shell
 # Projects can be imported using the project name.
 
-# Example:
 terraform import argocd_project.myproject myproject
 ```

docs/resources/repository.md

@@ -69,6 +69,8 @@ resource "argocd_repository" "private" {
 
 Import is supported using the following syntax:
 
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
+
 ```shell
 # Repositories can be imported using the repository URL.
 
@@ -77,6 +79,5 @@ Import is supported using the following syntax:
 # `ssh_private_key` and `tls_client_cert_key` attributes converge to their
 # expected values defined within the plan.
 
-# Example:
 terraform import argocd_repository.myrepo [email protected]:somerepo.git
 ```

docs/resources/repository_credentials.md

@@ -51,6 +51,8 @@ resource "argocd_repository_credentials" "private" {
 
 Import is supported using the following syntax:
 
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
+
 ```shell
 # Repository credentials can be imported using the repository URL.
 
@@ -59,6 +61,5 @@ Import is supported using the following syntax:
 # `ssh_private_key` and `tls_client_cert_key` attributes converge to their
 # expected values defined within the plan.
 
-# Example:
 terraform import argocd_repository_credentials.myrepocreds [email protected]:somerepo.git
 ```