Merge branch 'main' into 1.5.0

evertrust · Nov 12, 2024 · fc435e7 · fc435e7
2 parents 364cb1e + 3eda241
commit fc435e7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -10,7 +10,7 @@ jobs:
       ANSIBLE_GALAXY_API_TOKEN: ${{ secrets.ANSIBLE_GALAXY_API_TOKEN }}
     steps:
       - name: Setup ansible
-        run: apt-get update && apt-get install -y ansible
+        run: sudo apt-get update && sudo apt-get install -y ansible
 
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Makefile used to build the collection docs
 
 ANSIBLEGALAXYBUILD ?= ansible-galaxy
-ANSIBLEGALAXYOPTS  ?= --token="${ANSIBLE_GALAXY_TOKEN}" 
+ANSIBLEGALAXYOPTS  ?= --token="$(ANSIBLE_GALAXY_API_TOKEN)" 
 ANTSIBULLBUILD     ?= antsibull-docs
 ANTSIBULLOPTS	   ?=
 SPHINXBUILD        ?= sphinx-build
@@ -20,6 +20,6 @@ clean: ## Clean build artifacts
 	@rm -f build/*
 
 publish: build ## Build and publish build artifact to Ansible Galaxy
-	@ARTIFACT=$$(find "build" -name "*.tar.gz" ); \
+	ARTIFACT=$$(find "build" -name "*.tar.gz" ); \
 	echo $$ARTIFACT; \
-	$(ANSIBLEGALAXYBUILD) "collection" "publish" $$ARTIFACT $(ANSIBLEGALAXYPOTS)
+	$(ANSIBLEGALAXYBUILD) "collection" "publish" $$ARTIFACT $(ANSIBLEGALAXYOPTS)
diff --git a/plugins/modules/horizon_import.py b/plugins/modules/horizon_import.py
@@ -13,7 +13,8 @@
 author: Evertrust R&D (@EverTrust)
 short_description: Horizon import plugin
 description: Import a certificate or a private key.
-notes: Importing a certificate requires permissions on the related profile.
+notes:
+  - Importing a certificate requires permissions on the related profile.
 extends_documentation_fragment: evertrust.horizon.auth_options
 options:
   profile:

diff --git a/plugins/modules/horizon_revoke.py b/plugins/modules/horizon_revoke.py
@@ -12,8 +12,9 @@
 module: horizon_revoke
 author: Evertrust R&D (@EverTrust)
 short_description: Horizon revoke plugin
-description: Performs an revocation against the Horizon API.
-notes: Revoking a certificate requires permissions on the related profile.
+description: Performs a revocation against the Horizon API.
+notes:
+  - Revoking a certificate requires permissions on the related profile.
 extends_documentation_fragment: evertrust.horizon.auth_options
 options:
   certificate_pem:

diff --git a/plugins/modules/horizon_update.py b/plugins/modules/horizon_update.py
@@ -15,7 +15,8 @@
 author: Evertrust R&D (@EverTrust)
 short_description: Horizon update plugin
 description: Updates labels of a certificate.
-notes: Updating a certificate requires permissions on the related profile.
+notes:
+  - Updating a certificate requires permissions on the related profile.
 extends_documentation_fragment: evertrust.horizon.auth_options
 options:
   certificate_pem: