Merge branch 'master' into doc-fixes

codefresh-io · Mar 6, 2023 · 4a10d1b · 4a10d1b
2 parents e6f48f1 + 171f729
commit 4a10d1b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -18,7 +18,8 @@ jobs:
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.ref }}
-      - run: |
+      - name: Generate Docs
+        run: |
           export PATH=$PATH:/home/runner/go/bin
           make docs-prepare
           tfplugindocs generate

diff --git a/GNUmakefile b/GNUmakefile
@@ -5,7 +5,6 @@ HOSTNAME=codefresh.io
 PKG_NAME=codefresh
 NAMESPACE=app
 BINARY=terraform-provider-${PKG_NAME}
-VERSION=0.2.1
 OS_ARCH=darwin_amd64
 TFPLUGINDOCS_VERSION=v0.14.1
 
@@ -60,8 +59,8 @@ vet:
 	fi
 
 docs-prepare:
-	@echo "==> Setting up docs..."
-	which tfplugindocs || go get github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs@${TFPLUGINDOCS_VERSION}
+	@echo "==> Setting up tfplugindocs..."
+	go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs@${TFPLUGINDOCS_VERSION}
 
 docs: docs-prepare
 	@echo "==> Generating Provider Documentation..."

diff --git a/templates/index.md.tmpl b/templates/index.md.tmpl
@@ -29,7 +29,6 @@ For example:
 provider "codefresh" {
   api_key = "..."
 }
-
 provider "codefresh" {
   api_key = "..."
   alias   = "acme-dev"
@@ -43,4 +42,4 @@ resource "codefresh_pipeline" "pipeline-dev" {
   provider = codefresh.acme-dev
   ... # Omited for brevity
 }
-```
+```