From 82b99c3fbafbddadf7b056918d274f89580360d3 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Wed, 7 Jun 2023 14:11:01 +1000 Subject: [PATCH] Run acceptance tests against UniFi Network 7.4 (#377) --- .github/workflows/acctest.yml | 6 +++++- docker-compose.yaml | 2 +- internal/provider/data_port_profile_test.go | 10 ++++++++-- internal/provider/resource_device_test.go | 1 + 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/acctest.yml b/.github/workflows/acctest.yml index b247a80..e618a80 100644 --- a/.github/workflows/acctest.yml +++ b/.github/workflows/acctest.yml @@ -23,8 +23,12 @@ jobs: - "v7.1" - "v7.2" - "v7.3" + - "v7.4" - "v7" - "latest" + include: + - unifi_version: "v7.4" + unifi_download_url: "https://dl.ui.com/unifi/7.4.156/unifi_sysvinit_all.deb" steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -34,4 +38,4 @@ jobs: - name: TF acceptance tests timeout-minutes: 20 - run: make testacc UNIFI_STDOUT=true UNIFI_VERSION=${{ matrix.unifi_version }} + run: make testacc UNIFI_STDOUT=true UNIFI_VERSION=${{ matrix.unifi_download_url && 'beta' || matrix.unifi_version }} UNIFI_DOWNLOAD_URL=${{ matrix.unifi_download_url }} diff --git a/docker-compose.yaml b/docker-compose.yaml index 4d60425..3069389 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,8 +4,8 @@ services: image: "jacobalberty/unifi:${UNIFI_VERSION:-latest}" init: true restart: "always" - user: "unifi" environment: + PKGURL: "${UNIFI_DOWNLOAD_URL:-}" UNIFI_STDOUT: "true" ports: - "${UNIFI_HTTP_PORT:-8080}:8080/tcp" diff --git a/internal/provider/data_port_profile_test.go b/internal/provider/data_port_profile_test.go index 3e811e9..3d56fd4 100644 --- a/internal/provider/data_port_profile_test.go +++ b/internal/provider/data_port_profile_test.go @@ -9,7 +9,10 @@ import ( func TestAccDataPortProfile_default(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { preCheck(t) }, + PreCheck: func() { + preCheck(t) + preCheckVersionConstraint(t, "< 7.4") + }, ProviderFactories: providerFactories, // TODO: CheckDestroy: , Steps: []resource.TestStep{ @@ -23,7 +26,10 @@ func TestAccDataPortProfile_default(t *testing.T) { func TestAccDataPortProfile_multiple_providers(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { preCheck(t) }, + PreCheck: func() { + preCheck(t) + preCheckVersionConstraint(t, "< 7.4") + }, ProviderFactories: map[string]func() (*schema.Provider, error){ "unifi2": func() (*schema.Provider, error) { return New("acctest")(), nil diff --git a/internal/provider/resource_device_test.go b/internal/provider/resource_device_test.go index 5557fcd..d5494f1 100644 --- a/internal/provider/resource_device_test.go +++ b/internal/provider/resource_device_test.go @@ -253,6 +253,7 @@ func TestAccDevice_switch_portOverrides(t *testing.T) { PreCheck: func() { preCheck(t) preCheckDeviceExists(t, site, device.MAC) + preCheckVersionConstraint(t, "< 7.4") }, ProviderFactories: providerFactories, CheckDestroy: testAccCheckDeviceDestroy,