From 28cf2d497d6f41eb36e598b407333b66f1b79292 Mon Sep 17 00:00:00 2001 From: Tomas Dabasinskas Date: Tue, 7 Feb 2023 08:46:25 +0200 Subject: [PATCH 1/5] Bump Go --- README.md | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef0ce20..0c48821 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ most of the official documentation on developing this provider is also applicabl ### Requirements - [Terraform](https://www.terraform.io/downloads) -- [Go](https://go.dev/doc/install) (1.19) +- [Go](https://go.dev/doc/install) (1.20) - [GNU make](https://www.gnu.org/software/make/) - [Docker](https://docs.docker.com/get-docker/) (optional) diff --git a/go.mod b/go.mod index 2ca39b3..973a636 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/tdabasinskas/terraform-provider-backstage -go 1.19 +go 1.20 require ( github.com/hashicorp/terraform-plugin-docs v0.13.0 From 0c9f8139d31836829bf5297c182fc68f9464bebd Mon Sep 17 00:00:00 2001 From: Tomas Dabasinskas Date: Tue, 7 Feb 2023 08:46:37 +0200 Subject: [PATCH 2/5] Upload tests --- .github/workflows/test.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bfc1569..66e2246 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -86,9 +86,17 @@ jobs: - env: ACCTEST_SKIP_RESOURCE_TEST: "1" BACKSTAGE_BASE_URL: "https://demo.backstage.io" - run: go test -v -cover ./backstage + run: go test -v -cover -covermode=atomic -coverprofile=coverage1.out ./backstage timeout-minutes: 10 - env: BACKSTAGE_BASE_URL: "http://localhost:${{ job.services.backstage.ports[7000] }}" - run: go test -v -cover ./backstage -run TestAccResourceLocation + run: go test -v -cover -covermode=atomic -coverprofile=coverage2.out ./backstage -run TestAccResourceLocation timeout-minutes: 10 + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + files: | + ./coverage1.out + ./coverage2.out + verbose: true From a47d78618b87cedd6a799e8994ecd2f868eb212b Mon Sep 17 00:00:00 2001 From: Tomas Dabasinskas Date: Tue, 7 Feb 2023 08:50:25 +0200 Subject: [PATCH 3/5] Bump go-backstage --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 973a636..4616e6a 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/stretchr/testify v1.8.1 // indirect - github.com/tdabasinskas/go-backstage v1.1.0 // indirect + github.com/tdabasinskas/go-backstage v1.1.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect github.com/vmihailenco/tagparser v0.1.2 // indirect diff --git a/go.sum b/go.sum index 7c46e58..6f106eb 100644 --- a/go.sum +++ b/go.sum @@ -231,6 +231,8 @@ github.com/tdabasinskas/go-backstage v1.0.2 h1:f6WOT5GIpU9mtoLJileUcb9EdKOIy4FFC github.com/tdabasinskas/go-backstage v1.0.2/go.mod h1:aw7tu1VydRX26637tLcUO32vjnYVayspe34kja49200= github.com/tdabasinskas/go-backstage v1.1.0 h1:OF0t5LdSgtMvMrqVkX09uOjRYj/WmqyMRK8r/6rFaU0= github.com/tdabasinskas/go-backstage v1.1.0/go.mod h1:aw7tu1VydRX26637tLcUO32vjnYVayspe34kja49200= +github.com/tdabasinskas/go-backstage v1.1.1 h1:dBmObJWQ2qqzA/emGGttLGdPGhbehmXiQRC/HemEeXI= +github.com/tdabasinskas/go-backstage v1.1.1/go.mod h1:vXZ8Ypc/feAftJXPJB5EATaf1ouu9w0YOXnbyzO+hyc= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= From 9e96b12dfdf5ef0e26ff4d3c1abab6148b841003 Mon Sep 17 00:00:00 2001 From: Tomas Dabasinskas Date: Tue, 7 Feb 2023 08:53:23 +0200 Subject: [PATCH 4/5] Fix codecov filenames --- .github/workflows/test.yml | 4 +--- README.md | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 66e2246..f48b862 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -96,7 +96,5 @@ jobs: uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} - files: | - ./coverage1.out - ./coverage2.out + files: ./coverage1.out,./coverage2.out verbose: true diff --git a/README.md b/README.md index 0c48821..8d23dae 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Terraform Provider for Backstage [![Tests](https://github.com/tdabasinskas/terraform-provider-backstage/actions/workflows/test.yml/badge.svg)](https://github.com/tdabasinskas/terraform-provider-backstage/actions/workflows/test.yml) + [![go-github release (latest SemVer)](https://img.shields.io/github/v/release/tdabasinskas/terraform-provider-backstage?sort=semver)](https://github.com/tdabasinskas/terraform-provider-backstage/releases) [![registry](https://img.shields.io/static/v1?label=terraform&message=registry&color=blueviolet)](https://registry.terraform.io/providers/tdabasinskas/backstage/latest) From efbb3b1192211880b9beb5eaf9a4e4bbab0420a4 Mon Sep 17 00:00:00 2001 From: Tomas Dabasinskas Date: Tue, 7 Feb 2023 08:56:31 +0200 Subject: [PATCH 5/5] Add CodeCov badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d23dae..dd69181 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Terraform Provider for Backstage [![Tests](https://github.com/tdabasinskas/terraform-provider-backstage/actions/workflows/test.yml/badge.svg)](https://github.com/tdabasinskas/terraform-provider-backstage/actions/workflows/test.yml) - +[![codecov](https://codecov.io/gh/tdabasinskas/terraform-provider-backstage/branch/main/graph/badge.svg?token=1QSZTX0N2B)](https://codecov.io/gh/tdabasinskas/terraform-provider-backstage) [![go-github release (latest SemVer)](https://img.shields.io/github/v/release/tdabasinskas/terraform-provider-backstage?sort=semver)](https://github.com/tdabasinskas/terraform-provider-backstage/releases) [![registry](https://img.shields.io/static/v1?label=terraform&message=registry&color=blueviolet)](https://registry.terraform.io/providers/tdabasinskas/backstage/latest)