From 3f9ec51761f40b110789d91a54a404af06035c42 Mon Sep 17 00:00:00 2001 From: alida Date: Tue, 19 Mar 2024 18:40:09 +0100 Subject: [PATCH] Clean up: stick to camel case --- .github/workflows/backup.yml | 12 ++++++------ .github/workflows/filesystem.yml | 4 ++-- .github/workflows/firewall.yml | 8 ++++---- .github/workflows/ipv4_ipv6.yml | 16 ++++++++-------- .github/workflows/isoimage.yml | 8 ++++---- .github/workflows/k8s.yml | 4 ++-- .github/workflows/loadbalancer.yml | 4 ++-- .github/workflows/mariadb.yml | 4 ++-- .github/workflows/marketplace_app.yml | 12 ++++++------ .github/workflows/memcached.yml | 4 ++-- .github/workflows/mssql.yml | 4 ++-- .github/workflows/mysql8_0.yml | 4 ++-- .github/workflows/network.yml | 12 ++++++------ .github/workflows/object_storage.yml | 8 ++++---- .github/workflows/paas.yml | 8 ++++---- .github/workflows/postgres.yml | 4 ++-- .github/workflows/redis.yml | 8 ++++---- .github/workflows/server.yml | 8 ++++---- .github/workflows/snapshot.yml | 16 ++++++++-------- .github/workflows/sshkey.yml | 8 ++++---- .github/workflows/sslcert.yml | 8 ++++---- .github/workflows/storage.yml | 12 ++++++------ .github/workflows/template.yml | 8 ++++---- .../datasource_gridscale_backup_schedule_test.go | 6 +++--- gridscale/datasource_gridscale_backup_test.go | 6 +++--- gridscale/datasource_gridscale_firewall_test.go | 6 +++--- gridscale/datasource_gridscale_ipv4_test.go | 6 +++--- gridscale/datasource_gridscale_ipv6_test.go | 6 +++--- gridscale/datasource_gridscale_isoimage_test.go | 9 +++++---- .../datasource_gridscale_loadbalancer_test.go | 6 +++--- .../datasource_gridscale_marketplace_app_test.go | 6 +++--- gridscale/datasource_gridscale_network_test.go | 6 +++--- .../datasource_gridscale_objectstorage_test.go | 6 +++--- gridscale/datasource_gridscale_paas_test.go | 6 +++--- .../datasource_gridscale_publicnetwork_test.go | 6 +++--- .../datasource_gridscale_securityzone_test.go | 6 +++--- gridscale/datasource_gridscale_server_test.go | 6 +++--- gridscale/datasource_gridscale_snapshot_test.go | 6 +++--- ...datasource_gridscale_snapshotschedule_test.go | 6 +++--- gridscale/datasource_gridscale_sshkey_test.go | 6 +++--- gridscale/datasource_gridscale_sslcert_test.go | 6 +++--- gridscale/datasource_gridscale_storage_test.go | 6 +++--- gridscale/datasource_gridscale_template_test.go | 6 +++--- gridscale/provider_test.go | 4 ++-- .../resource_gridscale_backup_schedule_test.go | 14 +++++++------- gridscale/resource_gridscale_bucket_test.go | 6 +++--- gridscale/resource_gridscale_filesystem_test.go | 10 +++++----- gridscale/resource_gridscale_firewall_test.go | 10 +++++----- gridscale/resource_gridscale_ipv4_test.go | 10 +++++----- gridscale/resource_gridscale_ipv6_test.go | 10 +++++----- gridscale/resource_gridscale_isoimage_test.go | 10 +++++----- gridscale/resource_gridscale_k8s_test.go | 10 +++++----- .../resource_gridscale_loadbalancer_test.go | 8 ++++---- gridscale/resource_gridscale_mariadb_test.go | 10 +++++----- ...urce_gridscale_marketplace_app_import_test.go | 10 +++++----- .../resource_gridscale_marketplace_app_test.go | 10 +++++----- gridscale/resource_gridscale_mysql8_0_test.go | 10 +++++----- gridscale/resource_gridscale_mysql_test.go | 10 +++++----- gridscale/resource_gridscale_network_test.go | 10 +++++----- .../resource_gridscale_objectstorage_test.go | 6 +++--- gridscale/resource_gridscale_paas_test.go | 14 +++++++------- gridscale/resource_gridscale_postgresql_test.go | 10 +++++----- gridscale/resource_gridscale_redis_cache_test.go | 10 +++++----- gridscale/resource_gridscale_redis_store_test.go | 10 +++++----- .../resource_gridscale_securityzone_test.go | 10 +++++----- gridscale/resource_gridscale_server_test.go | 10 +++++----- gridscale/resource_gridscale_snapshot_test.go | 14 +++++++------- .../resource_gridscale_snapshotschedule_test.go | 14 +++++++------- gridscale/resource_gridscale_sqlserver_test.go | 10 +++++----- gridscale/resource_gridscale_sshkey_test.go | 10 +++++----- gridscale/resource_gridscale_sslcert_test.go | 6 +++--- .../resource_gridscale_storage_clone_test.go | 10 +++++----- gridscale/resource_gridscale_storage_test.go | 16 ++++++++-------- gridscale/resource_gridscale_template_test.go | 10 +++++----- 74 files changed, 310 insertions(+), 309 deletions(-) diff --git a/.github/workflows/backup.yml b/.github/workflows/backup.yml index ba85b3eb8..ea788c313 100644 --- a/.github/workflows/backup.yml +++ b/.github/workflows/backup.yml @@ -41,11 +41,11 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleBackup_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleBackup_basic' + - name: Run TestAccdataSourceGridscaleBackupBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleBackupBasic' - - name: Run TestAccdataSourceGridscaleBackupSchedule_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleBackupSchedule_basic' + - name: Run TestAccdataSourceGridscaleBackupScheduleBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleBackupScheduleBasic' - - name: Run TestAccResourceGridscaleBackupSchedule_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleBackupSchedule_Basic' + - name: Run TestAccResourceGridscaleBackupScheduleBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleBackupScheduleBasic' diff --git a/.github/workflows/filesystem.yml b/.github/workflows/filesystem.yml index 866c28e1f..9869ab19f 100644 --- a/.github/workflows/filesystem.yml +++ b/.github/workflows/filesystem.yml @@ -41,5 +41,5 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccResourceGridscaleFilesystem_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleFilesystem_Basic' + - name: Run TestAccResourceGridscaleFilesystemBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleFilesystemBasic' diff --git a/.github/workflows/firewall.yml b/.github/workflows/firewall.yml index 44863726f..b13989889 100644 --- a/.github/workflows/firewall.yml +++ b/.github/workflows/firewall.yml @@ -42,8 +42,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleFirewall_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleFirewall_basic' + - name: Run TestAccdataSourceGridscaleFirewallBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleFirewallBasic' - - name: Run TestAccResourceGridscaleFirewall_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleFirewall_Basic' + - name: Run TestAccResourceGridscaleFirewallBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleFirewallBasic' diff --git a/.github/workflows/ipv4_ipv6.yml b/.github/workflows/ipv4_ipv6.yml index fe1315af2..3b64296aa 100644 --- a/.github/workflows/ipv4_ipv6.yml +++ b/.github/workflows/ipv4_ipv6.yml @@ -41,14 +41,14 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleIPv4_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleIPv4_basic' + - name: Run TestAccdataSourceGridscaleIPv4Basic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleIPv4Basic' - - name: Run TestAccdataSourceGridscaleIPv6_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleIPv6_basic' + - name: Run TestAccdataSourceGridscaleIPv6Basic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleIPv6Basic' - - name: Run TestAccResourceGridscaleIpv4_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleIpv4_Basic' + - name: Run TestAccResourceGridscaleIpv4Basic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleIpv4Basic' - - name: Run TestAccResourceGridscaleIpv6_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleIpv6_Basic' + - name: Run TestAccResourceGridscaleIpv6Basic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleIpv6Basic' diff --git a/.github/workflows/isoimage.yml b/.github/workflows/isoimage.yml index f55cb9b5a..93e6af55c 100644 --- a/.github/workflows/isoimage.yml +++ b/.github/workflows/isoimage.yml @@ -41,8 +41,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccDataSourceISOImage_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccDataSourceISOImage_basic' + - name: Run TestAccDataSourceISOImageBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccDataSourceISOImageBasic' - - name: Run TestAccResourceGridscaleISOImage_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleISOImage_Basic' + - name: Run TestAccResourceGridscaleISOImageBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleISOImageBasic' diff --git a/.github/workflows/k8s.yml b/.github/workflows/k8s.yml index 0396b08b7..a0d1c40ab 100644 --- a/.github/workflows/k8s.yml +++ b/.github/workflows/k8s.yml @@ -41,5 +41,5 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccResourceGridscaleK8s_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleK8s_Basic' + - name: Run TestAccResourceGridscaleK8sBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleK8sBasic' diff --git a/.github/workflows/loadbalancer.yml b/.github/workflows/loadbalancer.yml index 321953499..021bde629 100644 --- a/.github/workflows/loadbalancer.yml +++ b/.github/workflows/loadbalancer.yml @@ -41,8 +41,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleLoadBalancer_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleLoadBalancer_basic' + - name: Run TestAccdataSourceGridscaleLoadBalancerBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleLoadBalancerBasic' - name: Run TestAccResourceGridscaleLoadBalancerBasic run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleLoadBalancerBasic' diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml index c0a6c4170..e860d7c4c 100644 --- a/.github/workflows/mariadb.yml +++ b/.github/workflows/mariadb.yml @@ -41,5 +41,5 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccResourceGridscaleMariaDB_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMariaDB_Basic' + - name: Run TestAccResourceGridscaleMariaDBBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMariaDBBasic' diff --git a/.github/workflows/marketplace_app.yml b/.github/workflows/marketplace_app.yml index 1ec733fbe..927fa22a2 100644 --- a/.github/workflows/marketplace_app.yml +++ b/.github/workflows/marketplace_app.yml @@ -41,11 +41,11 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleMarketplaceApplication_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleMarketplaceApplication_basic' + - name: Run TestAccdataSourceGridscaleMarketplaceApplicationBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleMarketplaceApplicationBasic' - - name: Run TestAccResourceGridscaleMarketplaceApplication_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMarketplaceApplication_Basic' + - name: Run TestAccResourceGridscaleMarketplaceApplicationBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMarketplaceApplicationBasic' - - name: Run TestAccResourceGridscaleMarketplaceApplicationImport_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMarketplaceApplicationImport_Basic' + - name: Run TestAccResourceGridscaleMarketplaceApplicationImportBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMarketplaceApplicationImportBasic' diff --git a/.github/workflows/memcached.yml b/.github/workflows/memcached.yml index a716a551f..463332fb6 100644 --- a/.github/workflows/memcached.yml +++ b/.github/workflows/memcached.yml @@ -41,5 +41,5 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccResourceGridscaleMemcached_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMemcached_Basic' + - name: Run TestAccResourceGridscaleMemcachedBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMemcachedBasic' diff --git a/.github/workflows/mssql.yml b/.github/workflows/mssql.yml index 07752d172..e01f5d6e2 100644 --- a/.github/workflows/mssql.yml +++ b/.github/workflows/mssql.yml @@ -41,5 +41,5 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccResourceGridscaleMSSQLServer_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMSSQLServer_Basic' + - name: Run TestAccResourceGridscaleMSSQLServerBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMSSQLServerBasic' diff --git a/.github/workflows/mysql8_0.yml b/.github/workflows/mysql8_0.yml index b4e623f43..c699b8404 100644 --- a/.github/workflows/mysql8_0.yml +++ b/.github/workflows/mysql8_0.yml @@ -41,5 +41,5 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccResourceGridscaleMySQL8_0_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMySQL8_0_Basic' + - name: Run TestAccResourceGridscaleMySQL8_0Basic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleMySQL8_0Basic' diff --git a/.github/workflows/network.yml b/.github/workflows/network.yml index ba5c97944..971491d44 100644 --- a/.github/workflows/network.yml +++ b/.github/workflows/network.yml @@ -42,11 +42,11 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleNetwork_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleNetwork_basic' + - name: Run TestAccdataSourceGridscaleNetworkBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleNetworkBasic' - - name: Run TestAccdataSourceGridscalePublicNetwork_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscalePublicNetwork_basic' + - name: Run TestAccdataSourceGridscalePublicNetworkBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscalePublicNetworkBasic' - - name: Run TestAccResourceGridscaleNetwork_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleNetwork_Basic' + - name: Run TestAccResourceGridscaleNetworkBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleNetworkBasic' diff --git a/.github/workflows/object_storage.yml b/.github/workflows/object_storage.yml index ea96c6ff7..97fda0756 100644 --- a/.github/workflows/object_storage.yml +++ b/.github/workflows/object_storage.yml @@ -41,8 +41,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleObjectStorage_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleObjectStorage_basic' + - name: Run TestAccdataSourceGridscaleObjectStorageBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleObjectStorageBasic' - - name: Run TestAccResourceGridscaleObjectStorage_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleObjectStorage_Basic' + - name: Run TestAccResourceGridscaleObjectStorageBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleObjectStorageBasic' diff --git a/.github/workflows/paas.yml b/.github/workflows/paas.yml index c1d62ce5c..e1c11ce7d 100644 --- a/.github/workflows/paas.yml +++ b/.github/workflows/paas.yml @@ -41,8 +41,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscalePaaS_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscalePaaS_basic' + - name: Run TestAccdataSourceGridscalePaaSBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscalePaaSBasic' - - name: Run TestAccResourceGridscalePaaS_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscalePaaS_Basic' + - name: Run TestAccResourceGridscalePaaSBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscalePaaSBasic' diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml index d751c2f80..b65857b80 100644 --- a/.github/workflows/postgres.yml +++ b/.github/workflows/postgres.yml @@ -41,5 +41,5 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccResourceGridscalePostgres_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscalePostgres_Basic' + - name: Run TestAccResourceGridscalePostgresBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscalePostgresBasic' diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml index 9738da161..cecfcf701 100644 --- a/.github/workflows/redis.yml +++ b/.github/workflows/redis.yml @@ -41,8 +41,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccResourceGridscaleRedisStore_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleRedisStore_Basic' + - name: Run TestAccResourceGridscaleRedisStoreBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleRedisStoreBasic' - - name: Run TestAccResourceGridscaleRedisCache_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleRedisCache_Basic' + - name: Run TestAccResourceGridscaleRedisCacheBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleRedisCacheBasic' diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 66b94bdf5..d2042c94b 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -44,8 +44,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleServer_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleServer_basic' + - name: Run TestAccdataSourceGridscaleServerBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleServerBasic' - - name: Run TestAccResourceGridscaleServer_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleServer_Basic' + - name: Run TestAccResourceGridscaleServerBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleServerBasic' diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index ef49278ba..4268e3b52 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -41,14 +41,14 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleSnapshot_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleSnapshot_basic' + - name: Run TestAccdataSourceGridscaleSnapshotBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleSnapshotBasic' - - name: Run TestAccdataSourceGridscaleSnapshotSchedule_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleSnapshotSchedule_basic' + - name: Run TestAccdataSourceGridscaleSnapshotScheduleBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleSnapshotScheduleBasic' - - name: Run TestAccResourceGridscaleSnapshot_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleSnapshot_Basic' + - name: Run TestAccResourceGridscaleSnapshotBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleSnapshotBasic' - - name: Run TestAccResourceGridscaleSnapshotSchedule_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleSnapshotSchedule_Basic' + - name: Run TestAccResourceGridscaleSnapshotScheduleBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleSnapshotScheduleBasic' diff --git a/.github/workflows/sshkey.yml b/.github/workflows/sshkey.yml index 9dcdc40ac..f80185932 100644 --- a/.github/workflows/sshkey.yml +++ b/.github/workflows/sshkey.yml @@ -41,8 +41,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleSSHKey_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleSSHKey_basic' + - name: Run TestAccdataSourceGridscaleSSHKeyBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleSSHKeyBasic' - - name: Run TestAccResourceGridscaleSshkey_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleSshkey_Basic' + - name: Run TestAccResourceGridscaleSshkeyBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleSshkeyBasic' diff --git a/.github/workflows/sslcert.yml b/.github/workflows/sslcert.yml index dc9aace4a..735334725 100644 --- a/.github/workflows/sslcert.yml +++ b/.github/workflows/sslcert.yml @@ -41,8 +41,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleSSLCert_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleSSLCert_basic' + - name: Run TestAccdataSourceGridscaleSSLCertBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleSSLCertBasic' - - name: Run TestAccResourceGridscaleSSLCert_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleSSLCert_Basic' + - name: Run TestAccResourceGridscaleSSLCertBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleSSLCertBasic' diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 9733806a6..56bbcf736 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -41,11 +41,11 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccdataSourceGridscaleStorage_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleStorage_basic' + - name: Run TestAccdataSourceGridscaleStorageBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccdataSourceGridscaleStorageBasic' - - name: Run TestAccResourceGridscaleStorage_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleStorage_Basic' + - name: Run TestAccResourceGridscaleStorageBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleStorageBasic' - - name: Run TestAccResourceGridscaleStorageClone_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleStorageClone_Basic' + - name: Run TestAccResourceGridscaleStorageCloneBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleStorageCloneBasic' diff --git a/.github/workflows/template.yml b/.github/workflows/template.yml index 636bf06f6..f291cc5a9 100644 --- a/.github/workflows/template.yml +++ b/.github/workflows/template.yml @@ -41,8 +41,8 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Run TestAccDataSourceTemplate_basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccDataSourceTemplate_basic' + - name: Run TestAccDataSourceTemplateBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccDataSourceTemplateBasic' - - name: Run TestAccResourceGridscaleTemplate_Basic - run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleTemplate_Basic' + - name: Run TestAccResourceGridscaleTemplateBasic + run: make testacc TEST=./gridscale TESTARGS='-run=TestAccResourceGridscaleTemplateBasic' diff --git a/gridscale/datasource_gridscale_backup_schedule_test.go b/gridscale/datasource_gridscale_backup_schedule_test.go index 1e6c3c643..d7dffeacc 100644 --- a/gridscale/datasource_gridscale_backup_schedule_test.go +++ b/gridscale/datasource_gridscale_backup_schedule_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleBackupSchedule_basic(t *testing.T) { +func TestAccdataSourceGridscaleBackupScheduleBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ @@ -18,7 +18,7 @@ func TestAccdataSourceGridscaleBackupSchedule_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceBackupScheduleConfig_basic(name), + Config: testAccCheckDataSourceBackupScheduleConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_backupschedule.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_backupschedule.foo", "name", name), @@ -29,7 +29,7 @@ func TestAccdataSourceGridscaleBackupSchedule_basic(t *testing.T) { } -func testAccCheckDataSourceBackupScheduleConfig_basic(name string) string { +func testAccCheckDataSourceBackupScheduleConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { diff --git a/gridscale/datasource_gridscale_backup_test.go b/gridscale/datasource_gridscale_backup_test.go index ebe72bae4..2368e7aa7 100644 --- a/gridscale/datasource_gridscale_backup_test.go +++ b/gridscale/datasource_gridscale_backup_test.go @@ -6,13 +6,13 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleBackup_basic(t *testing.T) { +func TestAccdataSourceGridscaleBackupBasic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceBackupConfig_basic(), + Config: testAccCheckDataSourceBackupConfigBasic(), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_backup_list.foo", "id"), ), @@ -22,7 +22,7 @@ func TestAccdataSourceGridscaleBackup_basic(t *testing.T) { } -func testAccCheckDataSourceBackupConfig_basic() string { +func testAccCheckDataSourceBackupConfigBasic() string { return ` resource "gridscale_storage" "foo" { name = "storage" diff --git a/gridscale/datasource_gridscale_firewall_test.go b/gridscale/datasource_gridscale_firewall_test.go index cd7421d98..d9297987a 100644 --- a/gridscale/datasource_gridscale_firewall_test.go +++ b/gridscale/datasource_gridscale_firewall_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleFirewall_basic(t *testing.T) { +func TestAccdataSourceGridscaleFirewallBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ @@ -18,7 +18,7 @@ func TestAccdataSourceGridscaleFirewall_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceFirewallConfig_basic(name), + Config: testAccCheckDataSourceFirewallConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_firewall.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_firewall.foo", "name", name), @@ -29,7 +29,7 @@ func TestAccdataSourceGridscaleFirewall_basic(t *testing.T) { } -func testAccCheckDataSourceFirewallConfig_basic(name string) string { +func testAccCheckDataSourceFirewallConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_firewall" "foo" { name = "%s" diff --git a/gridscale/datasource_gridscale_ipv4_test.go b/gridscale/datasource_gridscale_ipv4_test.go index 8cd6d99b8..d210013e2 100644 --- a/gridscale/datasource_gridscale_ipv4_test.go +++ b/gridscale/datasource_gridscale_ipv4_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleIPv4_basic(t *testing.T) { +func TestAccdataSourceGridscaleIPv4Basic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ @@ -18,7 +18,7 @@ func TestAccdataSourceGridscaleIPv4_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceIPv4Config_basic(name), + Config: testAccCheckDataSourceIPv4ConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_ipv4.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_ipv4.foo", "name", name), @@ -29,7 +29,7 @@ func TestAccdataSourceGridscaleIPv4_basic(t *testing.T) { } -func testAccCheckDataSourceIPv4Config_basic(name string) string { +func testAccCheckDataSourceIPv4ConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_ipv4" "foo" { diff --git a/gridscale/datasource_gridscale_ipv6_test.go b/gridscale/datasource_gridscale_ipv6_test.go index 078b0a7a0..87b60f884 100644 --- a/gridscale/datasource_gridscale_ipv6_test.go +++ b/gridscale/datasource_gridscale_ipv6_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleIPv6_basic(t *testing.T) { +func TestAccdataSourceGridscaleIPv6Basic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,7 +17,7 @@ func TestAccdataSourceGridscaleIPv6_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceIPv6Config_basic(name), + Config: testAccCheckDataSourceIPv6ConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_ipv6.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_ipv6.foo", "name", name), @@ -28,7 +28,7 @@ func TestAccdataSourceGridscaleIPv6_basic(t *testing.T) { } -func testAccCheckDataSourceIPv6Config_basic(name string) string { +func testAccCheckDataSourceIPv6ConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_ipv6" "foo" { diff --git a/gridscale/datasource_gridscale_isoimage_test.go b/gridscale/datasource_gridscale_isoimage_test.go index 957ec9a4a..2582023be 100644 --- a/gridscale/datasource_gridscale_isoimage_test.go +++ b/gridscale/datasource_gridscale_isoimage_test.go @@ -2,13 +2,14 @@ package gridscale import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "testing" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccDataSourceISOImage_basic(t *testing.T) { +func TestAccDataSourceISOImageBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -18,7 +19,7 @@ func TestAccDataSourceISOImage_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceGridscaleISOImageConfig_basic(name), + Config: testAccCheckDataSourceGridscaleISOImageConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_isoimage.foo", "id"), ), @@ -28,7 +29,7 @@ func TestAccDataSourceISOImage_basic(t *testing.T) { } -func testAccCheckDataSourceGridscaleISOImageConfig_basic(name string) string { +func testAccCheckDataSourceGridscaleISOImageConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_isoimage" "foo" { name = "%s" diff --git a/gridscale/datasource_gridscale_loadbalancer_test.go b/gridscale/datasource_gridscale_loadbalancer_test.go index e5cb6850d..bbfb456ca 100644 --- a/gridscale/datasource_gridscale_loadbalancer_test.go +++ b/gridscale/datasource_gridscale_loadbalancer_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleLoadBalancer_basic(t *testing.T) { +func TestAccdataSourceGridscaleLoadBalancerBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,7 +17,7 @@ func TestAccdataSourceGridscaleLoadBalancer_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceLoadBalancerConfig_basic(name), + Config: testAccCheckDataSourceLoadBalancerConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_loadbalancer.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_loadbalancer.foo", "name", name), @@ -35,7 +35,7 @@ func TestAccdataSourceGridscaleLoadBalancer_basic(t *testing.T) { } -func testAccCheckDataSourceLoadBalancerConfig_basic(name string) string { +func testAccCheckDataSourceLoadBalancerConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_ipv4" "lb" { diff --git a/gridscale/datasource_gridscale_marketplace_app_test.go b/gridscale/datasource_gridscale_marketplace_app_test.go index 575fb5028..321601355 100644 --- a/gridscale/datasource_gridscale_marketplace_app_test.go +++ b/gridscale/datasource_gridscale_marketplace_app_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleMarketplaceApplication_basic(t *testing.T) { +func TestAccdataSourceGridscaleMarketplaceApplicationBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ @@ -18,7 +18,7 @@ func TestAccdataSourceGridscaleMarketplaceApplication_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceMarketplaceApplicationConfig_basic(name), + Config: testAccCheckDataSourceMarketplaceApplicationConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_marketplace_application.foo", "id"), resource.TestCheckResourceAttrSet("data.gridscale_marketplace_application.foo", "category"), @@ -33,7 +33,7 @@ func TestAccdataSourceGridscaleMarketplaceApplication_basic(t *testing.T) { } -func testAccCheckDataSourceMarketplaceApplicationConfig_basic(name string) string { +func testAccCheckDataSourceMarketplaceApplicationConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_marketplace_application" "foo" { name = "%s" diff --git a/gridscale/datasource_gridscale_network_test.go b/gridscale/datasource_gridscale_network_test.go index 3e897b37b..bc8a1cec4 100644 --- a/gridscale/datasource_gridscale_network_test.go +++ b/gridscale/datasource_gridscale_network_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleNetwork_basic(t *testing.T) { +func TestAccdataSourceGridscaleNetworkBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,7 +17,7 @@ func TestAccdataSourceGridscaleNetwork_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceNetworkConfig_basic(name), + Config: testAccCheckDataSourceNetworkConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_network.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_network.foo", "name", name), @@ -36,7 +36,7 @@ func TestAccdataSourceGridscaleNetwork_basic(t *testing.T) { } -func testAccCheckDataSourceNetworkConfig_basic(name string) string { +func testAccCheckDataSourceNetworkConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_network" "foo" { diff --git a/gridscale/datasource_gridscale_objectstorage_test.go b/gridscale/datasource_gridscale_objectstorage_test.go index 63e618f58..05356295a 100644 --- a/gridscale/datasource_gridscale_objectstorage_test.go +++ b/gridscale/datasource_gridscale_objectstorage_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleObjectStorage_basic(t *testing.T) { +func TestAccdataSourceGridscaleObjectStorageBasic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -15,7 +15,7 @@ func TestAccdataSourceGridscaleObjectStorage_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceObjectStorageConfig_basic(), + Config: testAccCheckDataSourceObjectStorageConfigBasic(), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_object_storage_accesskey.foo", "id"), resource.TestCheckResourceAttrSet("data.gridscale_object_storage_accesskey.foo", "access_key"), @@ -27,7 +27,7 @@ func TestAccdataSourceGridscaleObjectStorage_basic(t *testing.T) { } -func testAccCheckDataSourceObjectStorageConfig_basic() string { +func testAccCheckDataSourceObjectStorageConfigBasic() string { return ` resource "gridscale_object_storage_accesskey" "foo" { } diff --git a/gridscale/datasource_gridscale_paas_test.go b/gridscale/datasource_gridscale_paas_test.go index 023ec7e69..7b7766d1f 100644 --- a/gridscale/datasource_gridscale_paas_test.go +++ b/gridscale/datasource_gridscale_paas_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscalePaaS_basic(t *testing.T) { +func TestAccdataSourceGridscalePaaSBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -16,7 +16,7 @@ func TestAccdataSourceGridscalePaaS_basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckDataSourcePaaSConfig_basic(name), + Config: testAccCheckDataSourcePaaSConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("data.gridscale_paas.foo", "name", name), resource.TestCheckResourceAttr("data.gridscale_paas.foo", "service_template_uuid", "d7a5e8ec-fa78-4d1b-86f9-febe3e16e398"), @@ -27,7 +27,7 @@ func TestAccdataSourceGridscalePaaS_basic(t *testing.T) { } -func testAccCheckDataSourcePaaSConfig_basic(name string) string { +func testAccCheckDataSourcePaaSConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_paas" "foo" { name = "%s" diff --git a/gridscale/datasource_gridscale_publicnetwork_test.go b/gridscale/datasource_gridscale_publicnetwork_test.go index 416371cf1..9b560dadd 100644 --- a/gridscale/datasource_gridscale_publicnetwork_test.go +++ b/gridscale/datasource_gridscale_publicnetwork_test.go @@ -6,14 +6,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscalePublicNetwork_basic(t *testing.T) { +func TestAccdataSourceGridscalePublicNetworkBasic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccCheckDataSourcePublicNetworkConfig_basic(), + Config: testAccCheckDataSourcePublicNetworkConfigBasic(), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_public_network.foo", "id"), resource.TestCheckResourceAttrSet("data.gridscale_public_network.foo", "name"), @@ -24,7 +24,7 @@ func TestAccdataSourceGridscalePublicNetwork_basic(t *testing.T) { } -func testAccCheckDataSourcePublicNetworkConfig_basic() string { +func testAccCheckDataSourcePublicNetworkConfigBasic() string { return ` data "gridscale_public_network" "foo" { }` diff --git a/gridscale/datasource_gridscale_securityzone_test.go b/gridscale/datasource_gridscale_securityzone_test.go index 402c326ab..20bdc444a 100644 --- a/gridscale/datasource_gridscale_securityzone_test.go +++ b/gridscale/datasource_gridscale_securityzone_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleSecurityZone_basic(t *testing.T) { +func TestAccdataSourceGridscaleSecurityZoneBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,7 +17,7 @@ func TestAccdataSourceGridscaleSecurityZone_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceSecurityZoneConfig_basic(name), + Config: testAccCheckDataSourceSecurityZoneConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_paas_securityzone.foo", "location_uuid"), resource.TestCheckResourceAttr("data.gridscale_paas_securityzone.foo", "name", name), @@ -28,7 +28,7 @@ func TestAccdataSourceGridscaleSecurityZone_basic(t *testing.T) { } -func testAccCheckDataSourceSecurityZoneConfig_basic(name string) string { +func testAccCheckDataSourceSecurityZoneConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_paas_securityzone" "foo" { name = "%s" diff --git a/gridscale/datasource_gridscale_server_test.go b/gridscale/datasource_gridscale_server_test.go index bea465dfd..f7764025a 100644 --- a/gridscale/datasource_gridscale_server_test.go +++ b/gridscale/datasource_gridscale_server_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleServer_basic(t *testing.T) { +func TestAccdataSourceGridscaleServerBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ @@ -18,7 +18,7 @@ func TestAccdataSourceGridscaleServer_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceServerConfig_basic(name), + Config: testAccCheckDataSourceServerConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_server.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_server.foo", "name", name), @@ -29,7 +29,7 @@ func TestAccdataSourceGridscaleServer_basic(t *testing.T) { } -func testAccCheckDataSourceServerConfig_basic(name string) string { +func testAccCheckDataSourceServerConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_server" "foo" { name = "%s" diff --git a/gridscale/datasource_gridscale_snapshot_test.go b/gridscale/datasource_gridscale_snapshot_test.go index a68b4ce0b..c383b64fc 100644 --- a/gridscale/datasource_gridscale_snapshot_test.go +++ b/gridscale/datasource_gridscale_snapshot_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleSnapshot_basic(t *testing.T) { +func TestAccdataSourceGridscaleSnapshotBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,7 +17,7 @@ func TestAccdataSourceGridscaleSnapshot_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceSnapshotConfig_basic(name), + Config: testAccCheckDataSourceSnapshotConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_snapshot.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_snapshot.foo", "name", name), @@ -28,7 +28,7 @@ func TestAccdataSourceGridscaleSnapshot_basic(t *testing.T) { } -func testAccCheckDataSourceSnapshotConfig_basic(name string) string { +func testAccCheckDataSourceSnapshotConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { name = "storage" diff --git a/gridscale/datasource_gridscale_snapshotschedule_test.go b/gridscale/datasource_gridscale_snapshotschedule_test.go index 9e439566a..ea4e5c726 100644 --- a/gridscale/datasource_gridscale_snapshotschedule_test.go +++ b/gridscale/datasource_gridscale_snapshotschedule_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleSnapshotSchedule_basic(t *testing.T) { +func TestAccdataSourceGridscaleSnapshotScheduleBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ @@ -18,7 +18,7 @@ func TestAccdataSourceGridscaleSnapshotSchedule_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceSnapshotScheduleConfig_basic(name), + Config: testAccCheckDataSourceSnapshotScheduleConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_snapshotschedule.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_snapshotschedule.foo", "name", name), @@ -29,7 +29,7 @@ func TestAccdataSourceGridscaleSnapshotSchedule_basic(t *testing.T) { } -func testAccCheckDataSourceSnapshotScheduleConfig_basic(name string) string { +func testAccCheckDataSourceSnapshotScheduleConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { diff --git a/gridscale/datasource_gridscale_sshkey_test.go b/gridscale/datasource_gridscale_sshkey_test.go index dba8e94db..ec8ce42fa 100644 --- a/gridscale/datasource_gridscale_sshkey_test.go +++ b/gridscale/datasource_gridscale_sshkey_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleSSHKey_basic(t *testing.T) { +func TestAccdataSourceGridscaleSSHKeyBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,7 +17,7 @@ func TestAccdataSourceGridscaleSSHKey_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceSSHKeyConfig_basic(name), + Config: testAccCheckDataSourceSSHKeyConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_sshkey.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_sshkey.foo", "name", name), @@ -28,7 +28,7 @@ func TestAccdataSourceGridscaleSSHKey_basic(t *testing.T) { } -func testAccCheckDataSourceSSHKeyConfig_basic(name string) string { +func testAccCheckDataSourceSSHKeyConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_sshkey" "foo" { diff --git a/gridscale/datasource_gridscale_sslcert_test.go b/gridscale/datasource_gridscale_sslcert_test.go index 5ba56b46e..e635274ab 100644 --- a/gridscale/datasource_gridscale_sslcert_test.go +++ b/gridscale/datasource_gridscale_sslcert_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleSSLCert_basic(t *testing.T) { +func TestAccdataSourceGridscaleSSLCertBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,7 +17,7 @@ func TestAccdataSourceGridscaleSSLCert_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceSSLCertConfig_basic(name), + Config: testAccCheckDataSourceSSLCertConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_ssl_certificate.foo", "id"), resource.TestCheckResourceAttrSet("data.gridscale_ssl_certificate.foo", "common_name"), @@ -36,7 +36,7 @@ func TestAccdataSourceGridscaleSSLCert_basic(t *testing.T) { } -func testAccCheckDataSourceSSLCertConfig_basic(name string) string { +func testAccCheckDataSourceSSLCertConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_ssl_certificate" "foo" { diff --git a/gridscale/datasource_gridscale_storage_test.go b/gridscale/datasource_gridscale_storage_test.go index ac7e10d76..b4b09c81e 100644 --- a/gridscale/datasource_gridscale_storage_test.go +++ b/gridscale/datasource_gridscale_storage_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccdataSourceGridscaleStorage_basic(t *testing.T) { +func TestAccdataSourceGridscaleStorageBasic(t *testing.T) { name := fmt.Sprintf("object-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -17,7 +17,7 @@ func TestAccdataSourceGridscaleStorage_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceStorageConfig_basic(name), + Config: testAccCheckDataSourceStorageConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_storage.foo", "id"), resource.TestCheckResourceAttr("data.gridscale_storage.foo", "name", name), @@ -29,7 +29,7 @@ func TestAccdataSourceGridscaleStorage_basic(t *testing.T) { } -func testAccCheckDataSourceStorageConfig_basic(name string) string { +func testAccCheckDataSourceStorageConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { diff --git a/gridscale/datasource_gridscale_template_test.go b/gridscale/datasource_gridscale_template_test.go index 731135b60..5ec5b7305 100644 --- a/gridscale/datasource_gridscale_template_test.go +++ b/gridscale/datasource_gridscale_template_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccDataSourceTemplate_basic(t *testing.T) { +func TestAccDataSourceTemplateBasic(t *testing.T) { name := "Ubuntu 22.04 LTS (Jammy Jellyfish) " resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -17,7 +17,7 @@ func TestAccDataSourceTemplate_basic(t *testing.T) { Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceGridscaleTemplateConfig_basic(name), + Config: testAccCheckDataSourceGridscaleTemplateConfigBasic(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.gridscale_template.foo", "id"), ), @@ -27,7 +27,7 @@ func TestAccDataSourceTemplate_basic(t *testing.T) { } -func testAccCheckDataSourceGridscaleTemplateConfig_basic(name string) string { +func testAccCheckDataSourceGridscaleTemplateConfigBasic(name string) string { return fmt.Sprintf(` data "gridscale_template" "foo" { name = "%s" diff --git a/gridscale/provider_test.go b/gridscale/provider_test.go index 326aa67aa..bbab62578 100644 --- a/gridscale/provider_test.go +++ b/gridscale/provider_test.go @@ -24,7 +24,7 @@ func TestProvider(t *testing.T) { } } -func TestProvider_impl(t *testing.T) { +func TestProviderInitialization(t *testing.T) { var _ *schema.Provider = Provider() } @@ -38,7 +38,7 @@ func testAccPreCheck(t *testing.T) { } } -func Test_convertStrToHeaderMap(t *testing.T) { +func TestConvertStrToHeaderMap(t *testing.T) { type testCase struct { InputStr string ExpectedOutput map[string]string diff --git a/gridscale/resource_gridscale_backup_schedule_test.go b/gridscale/resource_gridscale_backup_schedule_test.go index 792e07342..974079157 100644 --- a/gridscale/resource_gridscale_backup_schedule_test.go +++ b/gridscale/resource_gridscale_backup_schedule_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleBackupSchedule_Basic(t *testing.T) { +func TestAccResourceGridscaleBackupScheduleBasic(t *testing.T) { var object gsclient.StorageBackupSchedule name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleBackupSchedule_Basic(t *testing.T) { CheckDestroy: testAccCheckDataSourceGridscaleBackupScheduleDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceGridscaleBackupScheduleConfig_basic(name), + Config: testAccCheckDataSourceGridscaleBackupScheduleConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleBackupScheduleExists("gridscale_backupschedule.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleBackupSchedule_Basic(t *testing.T) { ), }, { - Config: testAccCheckDataSourceGridscaleBackupScheduleConfig_basic_update(), + Config: testAccCheckDataSourceGridscaleBackupScheduleConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleBackupScheduleExists("gridscale_backupschedule.foo", &object), resource.TestCheckResourceAttr( @@ -38,7 +38,7 @@ func TestAccResourceGridscaleBackupSchedule_Basic(t *testing.T) { ), }, { - Config: testAccCheckDataSourceGridscaleBackupScheduleConfig_forcenew_update(), + Config: testAccCheckDataSourceGridscaleBackupScheduleConfigForceNewUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleBackupScheduleExists("gridscale_backupschedule.foo", &object), resource.TestCheckResourceAttr( @@ -96,7 +96,7 @@ func testAccCheckDataSourceGridscaleBackupScheduleDestroyCheck(s *terraform.Stat return nil } -func testAccCheckDataSourceGridscaleBackupScheduleConfig_basic(name string) string { +func testAccCheckDataSourceGridscaleBackupScheduleConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { name = "storage" @@ -113,7 +113,7 @@ resource "gridscale_backupschedule" "foo" { `, name) } -func testAccCheckDataSourceGridscaleBackupScheduleConfig_basic_update() string { +func testAccCheckDataSourceGridscaleBackupScheduleConfigBasicUpdate() string { return ` resource "gridscale_storage" "foo" { name = "storage" @@ -130,7 +130,7 @@ resource "gridscale_backupschedule" "foo" { ` } -func testAccCheckDataSourceGridscaleBackupScheduleConfig_forcenew_update() string { +func testAccCheckDataSourceGridscaleBackupScheduleConfigForceNewUpdate() string { return ` resource "gridscale_storage" "new" { name = "storage" diff --git a/gridscale/resource_gridscale_bucket_test.go b/gridscale/resource_gridscale_bucket_test.go index a641f5f15..ebf672b5f 100644 --- a/gridscale/resource_gridscale_bucket_test.go +++ b/gridscale/resource_gridscale_bucket_test.go @@ -6,13 +6,13 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccResourceGridscaleBucket_Basic(t *testing.T) { +func TestAccResourceGridscaleBucketBasic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleBucketConfig_basic(), + Config: testAccCheckResourceGridscaleBucketConfigBasic(), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet( "gridscale_object_storage_bucket.foo", "access_key"), @@ -30,7 +30,7 @@ func TestAccResourceGridscaleBucket_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleBucketConfig_basic() string { +func testAccCheckResourceGridscaleBucketConfigBasic() string { return ` resource "gridscale_object_storage_accesskey" "test" { timeouts { diff --git a/gridscale/resource_gridscale_filesystem_test.go b/gridscale/resource_gridscale_filesystem_test.go index 9405678e2..4433c4118 100644 --- a/gridscale/resource_gridscale_filesystem_test.go +++ b/gridscale/resource_gridscale_filesystem_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscaleFilesystem_Basic(t *testing.T) { +func TestAccResourceGridscaleFilesystemBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("TEST-Filesystem-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ @@ -19,7 +19,7 @@ func TestAccResourceGridscaleFilesystem_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleFilesystemConfig_basic(name), + Config: testAccCheckResourceGridscaleFilesystemConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_filesystem.test", &object), resource.TestCheckResourceAttr( @@ -33,7 +33,7 @@ func TestAccResourceGridscaleFilesystem_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleFilesystemConfig_basic_update(), + Config: testAccCheckResourceGridscaleFilesystemConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_filesystem.test", &object), resource.TestCheckResourceAttr( @@ -46,7 +46,7 @@ func TestAccResourceGridscaleFilesystem_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleFilesystemConfig_basic(name string) string { +func testAccCheckResourceGridscaleFilesystemConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_filesystem" "test" { name = "%s" @@ -58,7 +58,7 @@ resource "gridscale_filesystem" "test" { `, name) } -func testAccCheckResourceGridscaleFilesystemConfig_basic_update() string { +func testAccCheckResourceGridscaleFilesystemConfigBasicUpdate() string { return ` resource "gridscale_filesystem" "test" { name = "newname" diff --git a/gridscale/resource_gridscale_firewall_test.go b/gridscale/resource_gridscale_firewall_test.go index a9dce2dc3..530d5c526 100644 --- a/gridscale/resource_gridscale_firewall_test.go +++ b/gridscale/resource_gridscale_firewall_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleFirewall_Basic(t *testing.T) { +func TestAccResourceGridscaleFirewallBasic(t *testing.T) { var object gsclient.Firewall name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleFirewall_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleFirewallDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleFirewallConfig_basic(name), + Config: testAccCheckResourceGridscaleFirewallConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleFirewallExists("gridscale_firewall.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleFirewall_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleFirewallConfig_basic_update(), + Config: testAccCheckResourceGridscaleFirewallConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleFirewallExists("gridscale_firewall.foo", &object), resource.TestCheckResourceAttr( @@ -97,7 +97,7 @@ func testAccCheckGridscaleFirewallDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleFirewallConfig_basic(name string) string { +func testAccCheckResourceGridscaleFirewallConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_firewall" "foo" { name = "%s" @@ -120,7 +120,7 @@ resource "gridscale_firewall" "foo" { `, name) } -func testAccCheckResourceGridscaleFirewallConfig_basic_update() string { +func testAccCheckResourceGridscaleFirewallConfigBasicUpdate() string { return ` resource "gridscale_firewall" "foo" { name = "newname" diff --git a/gridscale/resource_gridscale_ipv4_test.go b/gridscale/resource_gridscale_ipv4_test.go index 866a62a97..e0fde3762 100644 --- a/gridscale/resource_gridscale_ipv4_test.go +++ b/gridscale/resource_gridscale_ipv4_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleIpv4_Basic(t *testing.T) { +func TestAccResourceGridscaleIpv4Basic(t *testing.T) { var object gsclient.IP name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleIpv4_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleIpv4DestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleIpv4Config_basic(name), + Config: testAccCheckResourceGridscaleIpv4ConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleIpv4Exists("gridscale_ipv4.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleIpv4_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleIpv4Config_basic_update(), + Config: testAccCheckResourceGridscaleIpv4ConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleIpv4Exists("gridscale_ipv4.foo", &object), resource.TestCheckResourceAttr( @@ -101,7 +101,7 @@ func testAccCheckGridscaleIpv4DestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleIpv4Config_basic(name string) string { +func testAccCheckResourceGridscaleIpv4ConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_ipv4" "foo" { name = "%s" @@ -109,7 +109,7 @@ resource "gridscale_ipv4" "foo" { `, name) } -func testAccCheckResourceGridscaleIpv4Config_basic_update() string { +func testAccCheckResourceGridscaleIpv4ConfigBasicUpdate() string { return ` resource "gridscale_ipv4" "foo" { name = "newname" diff --git a/gridscale/resource_gridscale_ipv6_test.go b/gridscale/resource_gridscale_ipv6_test.go index b4d8550e9..7f39803af 100644 --- a/gridscale/resource_gridscale_ipv6_test.go +++ b/gridscale/resource_gridscale_ipv6_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleIpv6_Basic(t *testing.T) { +func TestAccResourceGridscaleIpv6Basic(t *testing.T) { var object gsclient.IP name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleIpv6_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleIpv6DestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleIpv6Config_basic(name), + Config: testAccCheckResourceGridscaleIpv6ConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleIpv6Exists("gridscale_ipv6.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleIpv6_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleIpv6Config_basic_update(), + Config: testAccCheckResourceGridscaleIpv6ConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleIpv6Exists("gridscale_ipv6.foo", &object), resource.TestCheckResourceAttr( @@ -101,7 +101,7 @@ func testAccCheckGridscaleIpv6DestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleIpv6Config_basic(name string) string { +func testAccCheckResourceGridscaleIpv6ConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_ipv6" "foo" { name = "%s" @@ -109,7 +109,7 @@ resource "gridscale_ipv6" "foo" { `, name) } -func testAccCheckResourceGridscaleIpv6Config_basic_update() string { +func testAccCheckResourceGridscaleIpv6ConfigBasicUpdate() string { return ` resource "gridscale_ipv6" "foo" { name = "newname" diff --git a/gridscale/resource_gridscale_isoimage_test.go b/gridscale/resource_gridscale_isoimage_test.go index a47fd5ddd..fefd53cac 100644 --- a/gridscale/resource_gridscale_isoimage_test.go +++ b/gridscale/resource_gridscale_isoimage_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleISOImage_Basic(t *testing.T) { +func TestAccResourceGridscaleISOImageBasic(t *testing.T) { var object gsclient.ISOImage name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleISOImage_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleISOImageDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleISOImageConfig_basic(name), + Config: testAccCheckResourceGridscaleISOImageConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleISOImageExists("gridscale_isoimage.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleISOImage_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleISOImageConfig_basic_update(), + Config: testAccCheckResourceGridscaleISOImageConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleISOImageExists("gridscale_isoimage.foo", &object), resource.TestCheckResourceAttr( @@ -97,7 +97,7 @@ func testAccCheckGridscaleISOImageDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleISOImageConfig_basic(name string) string { +func testAccCheckResourceGridscaleISOImageConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_isoimage" "foo" { name = "%s" @@ -113,7 +113,7 @@ resource "gridscale_server" "foo" { `, name, name) } -func testAccCheckResourceGridscaleISOImageConfig_basic_update() string { +func testAccCheckResourceGridscaleISOImageConfigBasicUpdate() string { return ` resource "gridscale_isoimage" "foo" { name = "newname" diff --git a/gridscale/resource_gridscale_k8s_test.go b/gridscale/resource_gridscale_k8s_test.go index 8ed62a4b0..1cad86d73 100644 --- a/gridscale/resource_gridscale_k8s_test.go +++ b/gridscale/resource_gridscale_k8s_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscaleK8s_Basic(t *testing.T) { +func TestAccResourceGridscaleK8sBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("k8s-%s", acctest.RandString(10)) @@ -20,7 +20,7 @@ func TestAccResourceGridscaleK8s_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleK8sConfig_basic(name), + Config: testAccCheckResourceGridscaleK8sConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_k8s.foopaas", &object), resource.TestCheckResourceAttr( @@ -28,7 +28,7 @@ func TestAccResourceGridscaleK8s_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleK8sConfig_basic_update(), + Config: testAccCheckResourceGridscaleK8sConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_k8s.foopaas", &object), resource.TestCheckResourceAttr( @@ -39,7 +39,7 @@ func TestAccResourceGridscaleK8s_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleK8sConfig_basic(name string) string { +func testAccCheckResourceGridscaleK8sConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_k8s" "foopaas" { name = "%s" @@ -57,7 +57,7 @@ resource "gridscale_k8s" "foopaas" { `, name) } -func testAccCheckResourceGridscaleK8sConfig_basic_update() string { +func testAccCheckResourceGridscaleK8sConfigBasicUpdate() string { return ` resource "gridscale_k8s" "foopaas" { name = "newname" diff --git a/gridscale/resource_gridscale_loadbalancer_test.go b/gridscale/resource_gridscale_loadbalancer_test.go index 80b0693db..6a6e8baec 100644 --- a/gridscale/resource_gridscale_loadbalancer_test.go +++ b/gridscale/resource_gridscale_loadbalancer_test.go @@ -22,7 +22,7 @@ func TestAccResourceGridscaleLoadBalancerBasic(t *testing.T) { CheckDestroy: testAccCheckGridscaleLoadBalancerDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleLoadBalancerConfig_basic(name, "leastconn"), + Config: testAccCheckResourceGridscaleLoadBalancerConfigBasic(name, "leastconn"), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleLoadBalancerExists("gridscale_loadbalancer.foo", &object), resource.TestCheckResourceAttr( @@ -34,7 +34,7 @@ func TestAccResourceGridscaleLoadBalancerBasic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleLoadBalancerConfig_update("newname", "roundrobin"), + Config: testAccCheckResourceGridscaleLoadBalancerConfigUpdate("newname", "roundrobin"), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleLoadBalancerExists("gridscale_loadbalancer.foo", &object), resource.TestCheckResourceAttr( @@ -79,7 +79,7 @@ func testAccCheckResourceGridscaleLoadBalancerExists(n string, object *gsclient. } } -func testAccCheckResourceGridscaleLoadBalancerConfig_basic(name string, algorithm string) string { +func testAccCheckResourceGridscaleLoadBalancerConfigBasic(name string, algorithm string) string { return fmt.Sprintf(` resource "gridscale_ipv4" "lb" { name = "ipv4-%s" @@ -111,7 +111,7 @@ resource "gridscale_loadbalancer" "foo" { }`, name, name, name, name, algorithm) } -func testAccCheckResourceGridscaleLoadBalancerConfig_update(name string, algorithm string) string { +func testAccCheckResourceGridscaleLoadBalancerConfigUpdate(name string, algorithm string) string { return fmt.Sprintf(` resource "gridscale_ipv4" "lb" { name = "ipv4-%s" diff --git a/gridscale/resource_gridscale_mariadb_test.go b/gridscale/resource_gridscale_mariadb_test.go index 2b7f56231..4d93c6e39 100644 --- a/gridscale/resource_gridscale_mariadb_test.go +++ b/gridscale/resource_gridscale_mariadb_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscaleMariaDB_Basic(t *testing.T) { +func TestAccResourceGridscaleMariaDBBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("postgres-%s", acctest.RandString(10)) @@ -20,7 +20,7 @@ func TestAccResourceGridscaleMariaDB_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleMariaDBConfig_basic(name), + Config: testAccCheckResourceGridscaleMariaDBConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_mariadb.test", &object), resource.TestCheckResourceAttr( @@ -28,7 +28,7 @@ func TestAccResourceGridscaleMariaDB_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleMariaDBConfig_basic_update(), + Config: testAccCheckResourceGridscaleMariaDBConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_mariadb.test", &object), resource.TestCheckResourceAttr( @@ -39,7 +39,7 @@ func TestAccResourceGridscaleMariaDB_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleMariaDBConfig_basic(name string) string { +func testAccCheckResourceGridscaleMariaDBConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_mariadb" "test" { name = "%s" @@ -49,7 +49,7 @@ resource "gridscale_mariadb" "test" { `, name) } -func testAccCheckResourceGridscaleMariaDBConfig_basic_update() string { +func testAccCheckResourceGridscaleMariaDBConfigBasicUpdate() string { return ` resource "gridscale_mariadb" "test" { name = "newname" diff --git a/gridscale/resource_gridscale_marketplace_app_import_test.go b/gridscale/resource_gridscale_marketplace_app_import_test.go index 28e8fcbef..f2ba53ce4 100644 --- a/gridscale/resource_gridscale_marketplace_app_import_test.go +++ b/gridscale/resource_gridscale_marketplace_app_import_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleMarketplaceApplicationImport_Basic(t *testing.T) { +func TestAccResourceGridscaleMarketplaceApplicationImportBasic(t *testing.T) { var object gsclient.MarketplaceApplication name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleMarketplaceApplicationImport_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleMarketplaceApplicationImportDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleMarketplaceApplicationImportConfig_basic(name), + Config: testAccCheckResourceGridscaleMarketplaceApplicationImportConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleMarketplaceApplicationImportExists("gridscale_marketplace_application_import.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleMarketplaceApplicationImport_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleMarketplaceApplicationImportConfig_basic_update(), + Config: testAccCheckResourceGridscaleMarketplaceApplicationImportConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleMarketplaceApplicationImportExists("gridscale_marketplace_application_import.foo", &object), resource.TestCheckResourceAttr( @@ -97,7 +97,7 @@ func testAccCheckGridscaleMarketplaceApplicationImportDestroyCheck(s *terraform. return nil } -func testAccCheckResourceGridscaleMarketplaceApplicationImportConfig_basic(name string) string { +func testAccCheckResourceGridscaleMarketplaceApplicationImportConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_marketplace_application" "foo" { name = "%s" @@ -114,7 +114,7 @@ resource "gridscale_marketplace_application_import" "foo" { `, name) } -func testAccCheckResourceGridscaleMarketplaceApplicationImportConfig_basic_update() string { +func testAccCheckResourceGridscaleMarketplaceApplicationImportConfigBasicUpdate() string { return ` resource "gridscale_marketplace_application" "foonew" { name = "newname" diff --git a/gridscale/resource_gridscale_marketplace_app_test.go b/gridscale/resource_gridscale_marketplace_app_test.go index e16c98f2c..57ed64da7 100644 --- a/gridscale/resource_gridscale_marketplace_app_test.go +++ b/gridscale/resource_gridscale_marketplace_app_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleMarketplaceApplication_Basic(t *testing.T) { +func TestAccResourceGridscaleMarketplaceApplicationBasic(t *testing.T) { var object gsclient.MarketplaceApplication name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleMarketplaceApplication_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleMarketplaceApplicationDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleMarketplaceApplicationConfig_basic(name), + Config: testAccCheckResourceGridscaleMarketplaceApplicationConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleMarketplaceApplicationExists("gridscale_marketplace_application.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleMarketplaceApplication_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleMarketplaceApplicationConfig_basic_update(), + Config: testAccCheckResourceGridscaleMarketplaceApplicationConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleMarketplaceApplicationExists("gridscale_marketplace_application.foo", &object), resource.TestCheckResourceAttr( @@ -97,7 +97,7 @@ func testAccCheckGridscaleMarketplaceApplicationDestroyCheck(s *terraform.State) return nil } -func testAccCheckResourceGridscaleMarketplaceApplicationConfig_basic(name string) string { +func testAccCheckResourceGridscaleMarketplaceApplicationConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_marketplace_application" "foo" { name = "%s" @@ -111,7 +111,7 @@ resource "gridscale_marketplace_application" "foo" { `, name) } -func testAccCheckResourceGridscaleMarketplaceApplicationConfig_basic_update() string { +func testAccCheckResourceGridscaleMarketplaceApplicationConfigBasicUpdate() string { return ` resource "gridscale_marketplace_application" "foo" { name = "newname" diff --git a/gridscale/resource_gridscale_mysql8_0_test.go b/gridscale/resource_gridscale_mysql8_0_test.go index 30b36bb2a..1962645a1 100644 --- a/gridscale/resource_gridscale_mysql8_0_test.go +++ b/gridscale/resource_gridscale_mysql8_0_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscaleMySQL8_0_Basic(t *testing.T) { +func TestAccResourceGridscaleMySQL8_0Basic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("MySQL-%s", acctest.RandString(10)) @@ -20,7 +20,7 @@ func TestAccResourceGridscaleMySQL8_0_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleMySQL8_0Config_basic(name), + Config: testAccCheckResourceGridscaleMySQL8_0ConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_mysql8_0.test", &object), resource.TestCheckResourceAttr( @@ -28,7 +28,7 @@ func TestAccResourceGridscaleMySQL8_0_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleMySQL8_0Config_basic_update(), + Config: testAccCheckResourceGridscaleMySQL8_0ConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_mysql8_0.test", &object), resource.TestCheckResourceAttr( @@ -39,7 +39,7 @@ func TestAccResourceGridscaleMySQL8_0_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleMySQL8_0Config_basic(name string) string { +func testAccCheckResourceGridscaleMySQL8_0ConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_mysql8_0" "test" { name = "%s" @@ -49,7 +49,7 @@ resource "gridscale_mysql8_0" "test" { `, name) } -func testAccCheckResourceGridscaleMySQL8_0Config_basic_update() string { +func testAccCheckResourceGridscaleMySQL8_0ConfigBasicUpdate() string { return ` resource "gridscale_mysql8_0" "test" { name = "newname" diff --git a/gridscale/resource_gridscale_mysql_test.go b/gridscale/resource_gridscale_mysql_test.go index 7555a555f..a23a12ebf 100644 --- a/gridscale/resource_gridscale_mysql_test.go +++ b/gridscale/resource_gridscale_mysql_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscaleMySQL_Basic(t *testing.T) { +func TestAccResourceGridscaleMySQLBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("MySQL-%s", acctest.RandString(10)) @@ -20,7 +20,7 @@ func TestAccResourceGridscaleMySQL_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleMySQLConfig_basic(name), + Config: testAccCheckResourceGridscaleMySQLConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_mysql.test", &object), resource.TestCheckResourceAttr( @@ -28,7 +28,7 @@ func TestAccResourceGridscaleMySQL_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleMySQLConfig_basic_update(), + Config: testAccCheckResourceGridscaleMySQLConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_mysql.test", &object), resource.TestCheckResourceAttr( @@ -39,7 +39,7 @@ func TestAccResourceGridscaleMySQL_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleMySQLConfig_basic(name string) string { +func testAccCheckResourceGridscaleMySQLConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_mysql" "test" { name = "%s" @@ -49,7 +49,7 @@ resource "gridscale_mysql" "test" { `, name) } -func testAccCheckResourceGridscaleMySQLConfig_basic_update() string { +func testAccCheckResourceGridscaleMySQLConfigBasicUpdate() string { return ` resource "gridscale_mysql" "test" { name = "newname" diff --git a/gridscale/resource_gridscale_network_test.go b/gridscale/resource_gridscale_network_test.go index 8fa46bcc1..666590ec7 100644 --- a/gridscale/resource_gridscale_network_test.go +++ b/gridscale/resource_gridscale_network_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleNetwork_Basic(t *testing.T) { +func TestAccResourceGridscaleNetworkBasic(t *testing.T) { var object gsclient.Network name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleNetwork_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleNetworkDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleNetworkConfig_basic(name), + Config: testAccCheckResourceGridscaleNetworkConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleNetworkExists("gridscale_network.foo", &object), resource.TestCheckResourceAttr( @@ -38,7 +38,7 @@ func TestAccResourceGridscaleNetwork_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleNetworkConfig_basic_update(), + Config: testAccCheckResourceGridscaleNetworkConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleNetworkExists("gridscale_network.foo", &object), resource.TestCheckResourceAttr( @@ -115,7 +115,7 @@ func testAccCheckGridscaleNetworkDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleNetworkConfig_basic(name string) string { +func testAccCheckResourceGridscaleNetworkConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_network" "foo" { name = "%s" @@ -128,7 +128,7 @@ resource "gridscale_network" "foo" { `, name) } -func testAccCheckResourceGridscaleNetworkConfig_basic_update() string { +func testAccCheckResourceGridscaleNetworkConfigBasicUpdate() string { return ` resource "gridscale_network" "foo" { name = "newname" diff --git a/gridscale/resource_gridscale_objectstorage_test.go b/gridscale/resource_gridscale_objectstorage_test.go index f48669e98..c9a5f89ce 100644 --- a/gridscale/resource_gridscale_objectstorage_test.go +++ b/gridscale/resource_gridscale_objectstorage_test.go @@ -11,7 +11,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleObjectStorage_Basic(t *testing.T) { +func TestAccResourceGridscaleObjectStorageBasic(t *testing.T) { var object gsclient.ObjectStorageAccessKey resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -19,7 +19,7 @@ func TestAccResourceGridscaleObjectStorage_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleObjectStorageDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleObjectStorageConfig_basic(), + Config: testAccCheckResourceGridscaleObjectStorageConfigBasic(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleObjectStorageExists("gridscale_object_storage_accesskey.foo", &object), resource.TestCheckResourceAttrSet( @@ -88,7 +88,7 @@ func testAccCheckGridscaleObjectStorageDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleObjectStorageConfig_basic() string { +func testAccCheckResourceGridscaleObjectStorageConfigBasic() string { return ` resource "gridscale_object_storage_accesskey" "foo" { } diff --git a/gridscale/resource_gridscale_paas_test.go b/gridscale/resource_gridscale_paas_test.go index 89f62b830..44a38355a 100644 --- a/gridscale/resource_gridscale_paas_test.go +++ b/gridscale/resource_gridscale_paas_test.go @@ -12,7 +12,7 @@ import ( "testing" ) -func TestAccResourceGridscalePaaS_Basic(t *testing.T) { +func TestAccResourceGridscalePaaSBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscalePaaS_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscalePaaSConfig_basic(name), + Config: testAccCheckResourceGridscalePaaSConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_paas.foopaas", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscalePaaS_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscalePaaSConfig_basic_update(), + Config: testAccCheckResourceGridscalePaaSConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_paas.foopaas", &object), resource.TestCheckResourceAttr( @@ -38,7 +38,7 @@ func TestAccResourceGridscalePaaS_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscalePaaSConfig_tmp_update(), + Config: testAccCheckResourceGridscalePaaSConfigTMPUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_paas.foopaas", &object), resource.TestCheckResourceAttr( @@ -95,7 +95,7 @@ func testAccCheckResourceGridscalePaaSDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscalePaaSConfig_basic(name string) string { +func testAccCheckResourceGridscalePaaSConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_paas" "foopaas" { name = "%s" @@ -104,7 +104,7 @@ resource "gridscale_paas" "foopaas" { `, name) } -func testAccCheckResourceGridscalePaaSConfig_basic_update() string { +func testAccCheckResourceGridscalePaaSConfigBasicUpdate() string { return ` resource "gridscale_paas" "foopaas" { name = "newname" @@ -129,7 +129,7 @@ resource "gridscale_paas" "foopaas" { // TO DO: update `service_template_uuid` when the backend enables the option to // update `service_template_uuid`. -func testAccCheckResourceGridscalePaaSConfig_tmp_update() string { +func testAccCheckResourceGridscalePaaSConfigTMPUpdate() string { return ` resource "gridscale_paas" "foopaas" { name = "newname" diff --git a/gridscale/resource_gridscale_postgresql_test.go b/gridscale/resource_gridscale_postgresql_test.go index 4147af1a2..c05565160 100644 --- a/gridscale/resource_gridscale_postgresql_test.go +++ b/gridscale/resource_gridscale_postgresql_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscalePostgres_Basic(t *testing.T) { +func TestAccResourceGridscalePostgresBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("postgres-%s", acctest.RandString(10)) @@ -20,7 +20,7 @@ func TestAccResourceGridscalePostgres_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscalePostgresConfig_basic(name), + Config: testAccCheckResourceGridscalePostgresConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_postgresql.test", &object), resource.TestCheckResourceAttr( @@ -28,7 +28,7 @@ func TestAccResourceGridscalePostgres_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscalePostgresConfig_basic_update(), + Config: testAccCheckResourceGridscalePostgresConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_postgresql.test", &object), resource.TestCheckResourceAttr( @@ -39,7 +39,7 @@ func TestAccResourceGridscalePostgres_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscalePostgresConfig_basic(name string) string { +func testAccCheckResourceGridscalePostgresConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_postgresql" "test" { name = "%s" @@ -54,7 +54,7 @@ resource "gridscale_postgresql" "test" { `, name) } -func testAccCheckResourceGridscalePostgresConfig_basic_update() string { +func testAccCheckResourceGridscalePostgresConfigBasicUpdate() string { return ` resource "gridscale_postgresql" "test" { name = "newname" diff --git a/gridscale/resource_gridscale_redis_cache_test.go b/gridscale/resource_gridscale_redis_cache_test.go index 894aa9a49..0d78dc67a 100644 --- a/gridscale/resource_gridscale_redis_cache_test.go +++ b/gridscale/resource_gridscale_redis_cache_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscaleRedisCache_Basic(t *testing.T) { +func TestAccResourceGridscaleRedisCacheBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("redis_cache-%s", acctest.RandString(10)) @@ -20,7 +20,7 @@ func TestAccResourceGridscaleRedisCache_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleRedisCacheConfig_basic(name), + Config: testAccCheckResourceGridscaleRedisCacheConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_redis_cache.test", &object), resource.TestCheckResourceAttr( @@ -28,7 +28,7 @@ func TestAccResourceGridscaleRedisCache_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleRedisCacheConfig_basic_update(), + Config: testAccCheckResourceGridscaleRedisCacheConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_redis_cache.test", &object), resource.TestCheckResourceAttr( @@ -39,7 +39,7 @@ func TestAccResourceGridscaleRedisCache_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleRedisCacheConfig_basic(name string) string { +func testAccCheckResourceGridscaleRedisCacheConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_redis_cache" "test" { name = "%s" @@ -49,7 +49,7 @@ resource "gridscale_redis_cache" "test" { `, name) } -func testAccCheckResourceGridscaleRedisCacheConfig_basic_update() string { +func testAccCheckResourceGridscaleRedisCacheConfigBasicUpdate() string { return ` resource "gridscale_redis_cache" "test" { name = "newname" diff --git a/gridscale/resource_gridscale_redis_store_test.go b/gridscale/resource_gridscale_redis_store_test.go index 6d5753fc4..b9d197758 100644 --- a/gridscale/resource_gridscale_redis_store_test.go +++ b/gridscale/resource_gridscale_redis_store_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscaleRedisStore_Basic(t *testing.T) { +func TestAccResourceGridscaleRedisStoreBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("redis_store-%s", acctest.RandString(10)) @@ -20,7 +20,7 @@ func TestAccResourceGridscaleRedisStore_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleRedisStoreConfig_basic(name), + Config: testAccCheckResourceGridscaleRedisStoreConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_redis_store.test", &object), resource.TestCheckResourceAttr( @@ -28,7 +28,7 @@ func TestAccResourceGridscaleRedisStore_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleRedisStoreConfig_basic_update(), + Config: testAccCheckResourceGridscaleRedisStoreConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_redis_store.test", &object), resource.TestCheckResourceAttr( @@ -39,7 +39,7 @@ func TestAccResourceGridscaleRedisStore_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleRedisStoreConfig_basic(name string) string { +func testAccCheckResourceGridscaleRedisStoreConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_redis_store" "test" { name = "%s" @@ -49,7 +49,7 @@ resource "gridscale_redis_store" "test" { `, name) } -func testAccCheckResourceGridscaleRedisStoreConfig_basic_update() string { +func testAccCheckResourceGridscaleRedisStoreConfigBasicUpdate() string { return ` resource "gridscale_redis_store" "test" { name = "newname" diff --git a/gridscale/resource_gridscale_securityzone_test.go b/gridscale/resource_gridscale_securityzone_test.go index 22266da7d..f1c3d5ce3 100644 --- a/gridscale/resource_gridscale_securityzone_test.go +++ b/gridscale/resource_gridscale_securityzone_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccDataSourceGridscaleSecurityZone_Basic(t *testing.T) { +func TestAccDataSourceGridscaleSecurityZoneBasic(t *testing.T) { var object gsclient.PaaSSecurityZone name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccDataSourceGridscaleSecurityZone_Basic(t *testing.T) { CheckDestroy: testAccCheckDataSourceGridscaleSecurityZoneDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceGridscaleSecurityZoneConfig_basic(name), + Config: testAccCheckDataSourceGridscaleSecurityZoneConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleSecurityZoneExists("gridscale_paas_securityzone.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccDataSourceGridscaleSecurityZone_Basic(t *testing.T) { ), }, { - Config: testAccCheckDataSourceGridscaleSecurityZoneConfig_basic_update(), + Config: testAccCheckDataSourceGridscaleSecurityZoneConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleSecurityZoneExists("gridscale_paas_securityzone.foo", &object), resource.TestCheckResourceAttr( @@ -87,7 +87,7 @@ func testAccCheckDataSourceGridscaleSecurityZoneDestroyCheck(s *terraform.State) return nil } -func testAccCheckDataSourceGridscaleSecurityZoneConfig_basic(name string) string { +func testAccCheckDataSourceGridscaleSecurityZoneConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_paas_securityzone" "foo" { name = "%s" @@ -95,7 +95,7 @@ resource "gridscale_paas_securityzone" "foo" { `, name) } -func testAccCheckDataSourceGridscaleSecurityZoneConfig_basic_update() string { +func testAccCheckDataSourceGridscaleSecurityZoneConfigBasicUpdate() string { return ` resource "gridscale_paas_securityzone" "foo" { name = "newname" diff --git a/gridscale/resource_gridscale_server_test.go b/gridscale/resource_gridscale_server_test.go index f3ea6d775..a19d078f6 100644 --- a/gridscale/resource_gridscale_server_test.go +++ b/gridscale/resource_gridscale_server_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleServer_Basic(t *testing.T) { +func TestAccResourceGridscaleServerBasic(t *testing.T) { var object gsclient.Server name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleServer_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscaleServerDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleServerConfig_basic(name), + Config: testAccCheckResourceGridscaleServerConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleServerExists("gridscale_server.foo", &object), resource.TestCheckResourceAttr( @@ -36,7 +36,7 @@ func TestAccResourceGridscaleServer_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleServerConfig_basic_update(), + Config: testAccCheckResourceGridscaleServerConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleServerExists("gridscale_server.foo", &object), resource.TestCheckResourceAttr( @@ -109,7 +109,7 @@ func testAccCheckResourceGridscaleServerDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleServerConfig_basic(name string) string { +func testAccCheckResourceGridscaleServerConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_ipv4" "foo" { name = "ip-%s" @@ -158,7 +158,7 @@ resource "gridscale_server" "foo" { `, name, name, name, name) } -func testAccCheckResourceGridscaleServerConfig_basic_update() string { +func testAccCheckResourceGridscaleServerConfigBasicUpdate() string { return ` resource "gridscale_ipv4" "foo1" { name = "newname" diff --git a/gridscale/resource_gridscale_snapshot_test.go b/gridscale/resource_gridscale_snapshot_test.go index c59dcfdbb..920143eb6 100644 --- a/gridscale/resource_gridscale_snapshot_test.go +++ b/gridscale/resource_gridscale_snapshot_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleSnapshot_Basic(t *testing.T) { +func TestAccResourceGridscaleSnapshotBasic(t *testing.T) { var object gsclient.StorageSnapshot name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleSnapshot_Basic(t *testing.T) { CheckDestroy: testAccCheckDataSourceGridscaleSnapshotDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceGridscaleSnapshotConfig_basic(name), + Config: testAccCheckDataSourceGridscaleSnapshotConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleSnapshotExists("gridscale_snapshot.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleSnapshot_Basic(t *testing.T) { ), }, { - Config: testAccCheckDataSourceGridscaleSnapshotConfig_basic_update(), + Config: testAccCheckDataSourceGridscaleSnapshotConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleSnapshotExists("gridscale_snapshot.foo", &object), resource.TestCheckResourceAttr( @@ -38,7 +38,7 @@ func TestAccResourceGridscaleSnapshot_Basic(t *testing.T) { ), }, { - Config: testAccCheckDataSourceGridscaleSnapshotConfig_forcenew_update(), + Config: testAccCheckDataSourceGridscaleSnapshotConfigForceNewUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleSnapshotExists("gridscale_snapshot.foo", &object), resource.TestCheckResourceAttr( @@ -96,7 +96,7 @@ func testAccCheckDataSourceGridscaleSnapshotDestroyCheck(s *terraform.State) err return nil } -func testAccCheckDataSourceGridscaleSnapshotConfig_basic(name string) string { +func testAccCheckDataSourceGridscaleSnapshotConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { name = "storage" @@ -112,7 +112,7 @@ resource "gridscale_snapshot" "foo" { `, name) } -func testAccCheckDataSourceGridscaleSnapshotConfig_basic_update() string { +func testAccCheckDataSourceGridscaleSnapshotConfigBasicUpdate() string { return ` resource "gridscale_storage" "foo" { name = "storage" @@ -132,7 +132,7 @@ resource "gridscale_snapshot" "foo" { ` } -func testAccCheckDataSourceGridscaleSnapshotConfig_forcenew_update() string { +func testAccCheckDataSourceGridscaleSnapshotConfigForceNewUpdate() string { return ` resource "gridscale_storage" "new" { name = "storage" diff --git a/gridscale/resource_gridscale_snapshotschedule_test.go b/gridscale/resource_gridscale_snapshotschedule_test.go index 22f888bc5..edcaaa438 100644 --- a/gridscale/resource_gridscale_snapshotschedule_test.go +++ b/gridscale/resource_gridscale_snapshotschedule_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleSnapshotSchedule_Basic(t *testing.T) { +func TestAccResourceGridscaleSnapshotScheduleBasic(t *testing.T) { var object gsclient.StorageSnapshotSchedule name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleSnapshotSchedule_Basic(t *testing.T) { CheckDestroy: testAccCheckDataSourceGridscaleSnapshotScheduleDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckDataSourceGridscaleSnapshotScheduleConfig_basic(name), + Config: testAccCheckDataSourceGridscaleSnapshotScheduleConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleSnapshotScheduleExists("gridscale_snapshotschedule.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleSnapshotSchedule_Basic(t *testing.T) { ), }, { - Config: testAccCheckDataSourceGridscaleSnapshotScheduleConfig_basic_update(), + Config: testAccCheckDataSourceGridscaleSnapshotScheduleConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleSnapshotScheduleExists("gridscale_snapshotschedule.foo", &object), resource.TestCheckResourceAttr( @@ -38,7 +38,7 @@ func TestAccResourceGridscaleSnapshotSchedule_Basic(t *testing.T) { ), }, { - Config: testAccCheckDataSourceGridscaleSnapshotScheduleConfig_forcenew_update(), + Config: testAccCheckDataSourceGridscaleSnapshotScheduleConfigForceNewUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceGridscaleSnapshotScheduleExists("gridscale_snapshotschedule.foo", &object), resource.TestCheckResourceAttr( @@ -96,7 +96,7 @@ func testAccCheckDataSourceGridscaleSnapshotScheduleDestroyCheck(s *terraform.St return nil } -func testAccCheckDataSourceGridscaleSnapshotScheduleConfig_basic(name string) string { +func testAccCheckDataSourceGridscaleSnapshotScheduleConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { name = "storage" @@ -112,7 +112,7 @@ resource "gridscale_snapshotschedule" "foo" { `, name) } -func testAccCheckDataSourceGridscaleSnapshotScheduleConfig_basic_update() string { +func testAccCheckDataSourceGridscaleSnapshotScheduleConfigBasicUpdate() string { return ` resource "gridscale_storage" "foo" { name = "storage" @@ -128,7 +128,7 @@ resource "gridscale_snapshotschedule" "foo" { ` } -func testAccCheckDataSourceGridscaleSnapshotScheduleConfig_forcenew_update() string { +func testAccCheckDataSourceGridscaleSnapshotScheduleConfigForceNewUpdate() string { return ` resource "gridscale_storage" "new" { name = "storage" diff --git a/gridscale/resource_gridscale_sqlserver_test.go b/gridscale/resource_gridscale_sqlserver_test.go index c7a8d30ea..ce5384b2d 100644 --- a/gridscale/resource_gridscale_sqlserver_test.go +++ b/gridscale/resource_gridscale_sqlserver_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -func TestAccResourceGridscaleMSSQLServer_Basic(t *testing.T) { +func TestAccResourceGridscaleMSSQLServerBasic(t *testing.T) { var object gsclient.PaaSService name := fmt.Sprintf("MSSQLServer-%s", acctest.RandString(10)) @@ -20,7 +20,7 @@ func TestAccResourceGridscaleMSSQLServer_Basic(t *testing.T) { CheckDestroy: testAccCheckResourceGridscalePaaSDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleMSSQLServerConfig_basic(name), + Config: testAccCheckResourceGridscaleMSSQLServerConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_sqlserver.test", &object), resource.TestCheckResourceAttr( @@ -28,7 +28,7 @@ func TestAccResourceGridscaleMSSQLServer_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleMSSQLServerConfig_basic_update(), + Config: testAccCheckResourceGridscaleMSSQLServerConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscalePaaSExists("gridscale_sqlserver.test", &object), resource.TestCheckResourceAttr( @@ -39,7 +39,7 @@ func TestAccResourceGridscaleMSSQLServer_Basic(t *testing.T) { }) } -func testAccCheckResourceGridscaleMSSQLServerConfig_basic(name string) string { +func testAccCheckResourceGridscaleMSSQLServerConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_sqlserver" "test" { name = "%s" @@ -49,7 +49,7 @@ resource "gridscale_sqlserver" "test" { `, name) } -func testAccCheckResourceGridscaleMSSQLServerConfig_basic_update() string { +func testAccCheckResourceGridscaleMSSQLServerConfigBasicUpdate() string { return ` resource "gridscale_sqlserver" "test" { name = "newname" diff --git a/gridscale/resource_gridscale_sshkey_test.go b/gridscale/resource_gridscale_sshkey_test.go index f5da47fb0..8b51baf5f 100644 --- a/gridscale/resource_gridscale_sshkey_test.go +++ b/gridscale/resource_gridscale_sshkey_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleSshkey_Basic(t *testing.T) { +func TestAccResourceGridscaleSshkeyBasic(t *testing.T) { var object gsclient.Sshkey name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleSshkey_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleSshkeyDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleSshkeyConfig_basic(name), + Config: testAccCheckResourceGridscaleSshkeyConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleSshkeyExists("gridscale_sshkey.foo", &object), resource.TestCheckResourceAttr( @@ -32,7 +32,7 @@ func TestAccResourceGridscaleSshkey_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleSshkeyConfig_basic_update(), + Config: testAccCheckResourceGridscaleSshkeyConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleSshkeyExists("gridscale_sshkey.foo", &object), resource.TestCheckResourceAttr( @@ -101,7 +101,7 @@ func testAccCheckGridscaleSshkeyDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleSshkeyConfig_basic(name string) string { +func testAccCheckResourceGridscaleSshkeyConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_sshkey" "foo" { name = "%s" @@ -110,7 +110,7 @@ resource "gridscale_sshkey" "foo" { `, name) } -func testAccCheckResourceGridscaleSshkeyConfig_basic_update() string { +func testAccCheckResourceGridscaleSshkeyConfigBasicUpdate() string { return ` resource "gridscale_sshkey" "foo" { name = "newname" diff --git a/gridscale/resource_gridscale_sslcert_test.go b/gridscale/resource_gridscale_sslcert_test.go index 60e76e35c..f6ef99978 100644 --- a/gridscale/resource_gridscale_sslcert_test.go +++ b/gridscale/resource_gridscale_sslcert_test.go @@ -17,7 +17,7 @@ const ( leafCertExample = "-----BEGIN CERTIFICATE-----\nMIIC1TCCAb2gAwIBAgIJAP4/xUQz5NypMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV\nBAMTD3d3dy5leGFtcGxlLmNvbTAeFw0yMTAzMjkxNDQxNTdaFw0zMTAzMjcxNDQx\nNTdaMBoxGDAWBgNVBAMTD3d3dy5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEB\nBQADggEPADCCAQoCggEBANIM0Lom/iIwroEsBrSzmibfVRhpI9BQM1x9AigEhjo3\nttb90/TNpbhEZ+EsElVVQJgbyy6e0jIVikxsRmd+8KHcsGEIiSVYk2w0VkhxJqpX\ndPTMVANL8G8fSlCeUsGVCp6PViKhSBt9EyptqUSe17qVgigXac46uxackWdSjNuE\ntnw3muCM7h0cCb3s9geRFaPbOvTYNVm/wFi5I0joQeJYXV4LKjT33g2fiKhb6c4b\n4fPui5FYUhSJgB4o35uFR/qBsota38OZwl4dUIBPirb8mFT6buYwD/dw2DVTxjHx\naD8aWtQWg896U1sc/A3CPvWb+EyD/4Jn3YzKvOdX7PUCAwEAAaMeMBwwGgYDVR0R\nBBMwEYIPd3d3LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQDKWvBcVS1R\n8K+HYBpEaVnElMk7vBOvdq7h/SZSXVAGNgNM1RPK7w6zWyDwI2Zs5COQiAbK0MwL\nBkI6RwTfDd8RL/nZe35iL6agI0CQbX3/l7Zo09n2RpShpzHbzWIkuzPNlzR+b0pb\nIGyChAsL1O+d3Ft/8LFkFiXIcEb+0kB75X/R+Tx2+LmCMxCHM4JYudzE8mzuKHuR\neXktzUNvVHzkcAN1rpTCK0tGJivmh+QMrwXZh2cWsL6xdI8m24J+e2zJef/mosYQ\n+xX/qCCQKbsRfckG3SDHi6RZlCnzrwSaW+djekAIuju+3HIbeDjjAI4DUSfqd1SH\n87fnnaj9tE69\n-----END CERTIFICATE-----" ) -func TestAccResourceGridscaleSSLCert_Basic(t *testing.T) { +func TestAccResourceGridscaleSSLCertBasic(t *testing.T) { var object gsclient.SSLCertificate name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -27,7 +27,7 @@ func TestAccResourceGridscaleSSLCert_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleSSLCertDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleSSLCertConfig_basic(name), + Config: testAccCheckResourceGridscaleSSLCertConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleSSLCertExists("gridscale_ssl_certificate.foo", &object), resource.TestCheckResourceAttr( @@ -108,7 +108,7 @@ func testAccCheckGridscaleSSLCertDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleSSLCertConfig_basic(name string) string { +func testAccCheckResourceGridscaleSSLCertConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_ssl_certificate" "foo" { name = "%s" diff --git a/gridscale/resource_gridscale_storage_clone_test.go b/gridscale/resource_gridscale_storage_clone_test.go index b3f2499df..10ab6d908 100644 --- a/gridscale/resource_gridscale_storage_clone_test.go +++ b/gridscale/resource_gridscale_storage_clone_test.go @@ -8,7 +8,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleStorageClone_Basic(t *testing.T) { +func TestAccResourceGridscaleStorageCloneBasic(t *testing.T) { var object gsclient.Storage resource.Test(t, resource.TestCase{ @@ -17,7 +17,7 @@ func TestAccResourceGridscaleStorageClone_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleStorageDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleStorageCloneConfig_basic(), + Config: testAccCheckResourceGridscaleStorageCloneConfigBasic(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleStorageExists("gridscale_storage_clone.foo", &object), resource.TestCheckResourceAttrSet("gridscale_storage_clone.foo", "name"), @@ -26,7 +26,7 @@ func TestAccResourceGridscaleStorageClone_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleStorageCloneConfig_basic_update(), + Config: testAccCheckResourceGridscaleStorageCloneConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleStorageExists("gridscale_storage_clone.foo", &object), resource.TestCheckResourceAttr( @@ -66,7 +66,7 @@ func TestAccResourceGridscaleStorageClone_Basic(t *testing.T) { return nil }*/ -func testAccCheckResourceGridscaleStorageCloneConfig_basic() string { +func testAccCheckResourceGridscaleStorageCloneConfigBasic() string { return ` resource "gridscale_storage" "foo" { name = "test" @@ -81,7 +81,7 @@ resource "gridscale_storage_clone" "foo" { ` } -func testAccCheckResourceGridscaleStorageCloneConfig_basic_update() string { +func testAccCheckResourceGridscaleStorageCloneConfigBasicUpdate() string { return ` resource "gridscale_storage" "foo" { name = "test" diff --git a/gridscale/resource_gridscale_storage_test.go b/gridscale/resource_gridscale_storage_test.go index 3e624a33c..9be785fd6 100644 --- a/gridscale/resource_gridscale_storage_test.go +++ b/gridscale/resource_gridscale_storage_test.go @@ -13,7 +13,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleStorage_Basic(t *testing.T) { +func TestAccResourceGridscaleStorageBasic(t *testing.T) { var object gsclient.Storage name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -23,7 +23,7 @@ func TestAccResourceGridscaleStorage_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleStorageDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleStorageConfig_basic(name), + Config: testAccCheckResourceGridscaleStorageConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleStorageExists("gridscale_storage.foo", &object), resource.TestCheckResourceAttr( @@ -33,7 +33,7 @@ func TestAccResourceGridscaleStorage_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleStorageConfig_basic_update(), + Config: testAccCheckResourceGridscaleStorageConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleStorageExists("gridscale_storage.foo", &object), resource.TestCheckResourceAttr( @@ -44,7 +44,7 @@ func TestAccResourceGridscaleStorage_Basic(t *testing.T) { }) } -func TestAccResourceGridscaleStorage_Advanced(t *testing.T) { +func TestAccResourceGridscaleStorageAdvanced(t *testing.T) { var object gsclient.Storage name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -54,7 +54,7 @@ func TestAccResourceGridscaleStorage_Advanced(t *testing.T) { CheckDestroy: testAccCheckGridscaleStorageDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleStorageConfig_advanced(name), + Config: testAccCheckResourceGridscaleStorageConfigAdvanced(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleStorageExists("gridscale_storage.foo", &object), resource.TestCheckResourceAttr( @@ -128,7 +128,7 @@ func testAccCheckGridscaleStorageDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleStorageConfig_basic(name string) string { +func testAccCheckResourceGridscaleStorageConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { name = "%s" @@ -137,7 +137,7 @@ resource "gridscale_storage" "foo" { `, name) } -func testAccCheckResourceGridscaleStorageConfig_basic_update() string { +func testAccCheckResourceGridscaleStorageConfigBasicUpdate() string { return ` resource "gridscale_storage" "foo" { name = "newname" @@ -146,7 +146,7 @@ resource "gridscale_storage" "foo" { ` } -func testAccCheckResourceGridscaleStorageConfig_advanced(name string) string { +func testAccCheckResourceGridscaleStorageConfigAdvanced(name string) string { return fmt.Sprintf(` resource "gridscale_sshkey" "sshkey" { name = "%s" diff --git a/gridscale/resource_gridscale_template_test.go b/gridscale/resource_gridscale_template_test.go index 8fa824292..27a846dc9 100644 --- a/gridscale/resource_gridscale_template_test.go +++ b/gridscale/resource_gridscale_template_test.go @@ -12,7 +12,7 @@ import ( "github.com/gridscale/gsclient-go/v3" ) -func TestAccResourceGridscaleTemplate_Basic(t *testing.T) { +func TestAccResourceGridscaleTemplateBasic(t *testing.T) { var object gsclient.Template name := fmt.Sprintf("object-%s", acctest.RandString(10)) @@ -22,7 +22,7 @@ func TestAccResourceGridscaleTemplate_Basic(t *testing.T) { CheckDestroy: testAccCheckGridscaleTemplateDestroyCheck, Steps: []resource.TestStep{ { - Config: testAccCheckResourceGridscaleTemplateConfig_basic(name), + Config: testAccCheckResourceGridscaleTemplateConfigBasic(name), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleTemplateExists("gridscale_template.foo", &object), resource.TestCheckResourceAttr( @@ -30,7 +30,7 @@ func TestAccResourceGridscaleTemplate_Basic(t *testing.T) { ), }, { - Config: testAccCheckResourceGridscaleTemplateConfig_basic_update(), + Config: testAccCheckResourceGridscaleTemplateConfigBasicUpdate(), Check: resource.ComposeTestCheckFunc( testAccCheckResourceGridscaleTemplateExists("gridscale_template.foo", &object), resource.TestCheckResourceAttr( @@ -97,7 +97,7 @@ func testAccCheckGridscaleTemplateDestroyCheck(s *terraform.State) error { return nil } -func testAccCheckResourceGridscaleTemplateConfig_basic(name string) string { +func testAccCheckResourceGridscaleTemplateConfigBasic(name string) string { return fmt.Sprintf(` resource "gridscale_storage" "foo" { name = "%s" @@ -116,7 +116,7 @@ resource "gridscale_template" "foo" { `, name, name, name) } -func testAccCheckResourceGridscaleTemplateConfig_basic_update() string { +func testAccCheckResourceGridscaleTemplateConfigBasicUpdate() string { return ` resource "gridscale_storage" "foo" { name = "newname"