@@ -1757,9 +1757,9 @@ func TestAccSQLDatabaseInstance_sqlMysqlDataCacheConfig(t *testing.T) {
1757
1757
CheckDestroy : testAccSqlDatabaseInstanceDestroyProducer (t ),
1758
1758
Steps : []resource.TestStep {
1759
1759
{
1760
- Config : testGoogleSqlDatabaseInstance_sqlMysqlDataCacheConfig (instanceName ),
1760
+ Config : testGoogleSqlDatabaseInstance_sqlMysqlDataCacheConfig (instanceName , false ),
1761
1761
Check : resource .ComposeAggregateTestCheckFunc (
1762
- resource .TestCheckResourceAttr ("google_sql_database_instance.instance" , "settings.0.data_cache_config.0.data_cache_enabled" , "true " ),
1762
+ resource .TestCheckResourceAttr ("google_sql_database_instance.instance" , "settings.0.data_cache_config.0.data_cache_enabled" , "false " ),
1763
1763
),
1764
1764
},
1765
1765
{
@@ -1768,6 +1768,12 @@ func TestAccSQLDatabaseInstance_sqlMysqlDataCacheConfig(t *testing.T) {
1768
1768
ImportStateVerify : true ,
1769
1769
ImportStateVerifyIgnore : []string {"deletion_protection" },
1770
1770
},
1771
+ {
1772
+ Config : testGoogleSqlDatabaseInstance_sqlMysqlDataCacheConfig (instanceName , true ),
1773
+ Check : resource .ComposeAggregateTestCheckFunc (
1774
+ resource .TestCheckResourceAttr ("google_sql_database_instance.instance" , "settings.0.data_cache_config.0.data_cache_enabled" , "true" ),
1775
+ ),
1776
+ },
1771
1777
},
1772
1778
})
1773
1779
}
@@ -1784,7 +1790,7 @@ func TestAccSQLDatabaseInstance_sqlPostgresDataCacheConfig(t *testing.T) {
1784
1790
CheckDestroy : testAccSqlDatabaseInstanceDestroyProducer (t ),
1785
1791
Steps : []resource.TestStep {
1786
1792
{
1787
- Config : testGoogleSqlDatabaseInstance_sqlPostgresDataCacheConfig (enterprisePlusInstanceName , enterprisePlusTier , "ENTERPRISE_PLUS" ),
1793
+ Config : testGoogleSqlDatabaseInstance_sqlPostgresDataCacheConfig (enterprisePlusInstanceName , enterprisePlusTier , "ENTERPRISE_PLUS" , true ),
1788
1794
Check : resource .ComposeAggregateTestCheckFunc (
1789
1795
resource .TestCheckResourceAttr ("google_sql_database_instance.instance" , "settings.0.data_cache_config.0.data_cache_enabled" , "true" ),
1790
1796
),
@@ -1796,7 +1802,19 @@ func TestAccSQLDatabaseInstance_sqlPostgresDataCacheConfig(t *testing.T) {
1796
1802
ImportStateVerifyIgnore : []string {"deletion_protection" },
1797
1803
},
1798
1804
{
1799
- Config : testGoogleSqlDatabaseInstance_sqlPostgresDataCacheConfig (enterpriseInstanceName , enterpriseTier , "ENTERPRISE" ),
1805
+ Config : testGoogleSqlDatabaseInstance_sqlPostgresDataCacheConfig (enterprisePlusInstanceName , enterprisePlusTier , "ENTERPRISE_PLUS" , false ),
1806
+ Check : resource .ComposeAggregateTestCheckFunc (
1807
+ resource .TestCheckResourceAttr ("google_sql_database_instance.instance" , "settings.0.data_cache_config.0.data_cache_enabled" , "false" ),
1808
+ ),
1809
+ },
1810
+ {
1811
+ ResourceName : "google_sql_database_instance.instance" ,
1812
+ ImportState : true ,
1813
+ ImportStateVerify : true ,
1814
+ ImportStateVerifyIgnore : []string {"deletion_protection" },
1815
+ },
1816
+ {
1817
+ Config : testGoogleSqlDatabaseInstance_sqlPostgresDataCacheConfig (enterpriseInstanceName , enterpriseTier , "ENTERPRISE" , true ),
1800
1818
ExpectError : regexp .MustCompile (
1801
1819
fmt .Sprintf ("Error, failed to create instance %s: googleapi: Error 400: Invalid request: Only ENTERPRISE PLUS edition supports data cache" , enterpriseInstanceName )),
1802
1820
},
@@ -1826,7 +1844,7 @@ func TestAccSqlDatabaseInstance_Mysql_Edition_Upgrade(t *testing.T) {
1826
1844
ImportStateVerifyIgnore : []string {"deletion_protection" },
1827
1845
},
1828
1846
{
1829
- Config : testGoogleSqlDatabaseInstance_sqlMysqlDataCacheConfig (editionUpgrade ),
1847
+ Config : testGoogleSqlDatabaseInstance_sqlMysqlDataCacheConfig (editionUpgrade , true ),
1830
1848
Check : resource .ComposeAggregateTestCheckFunc (
1831
1849
resource .TestCheckResourceAttr ("google_sql_database_instance.instance" , "settings.0.edition" , "ENTERPRISE_PLUS" ),
1832
1850
resource .TestCheckResourceAttr ("google_sql_database_instance.instance" , "settings.0.data_cache_config.0.data_cache_enabled" , "true" ),
@@ -2901,7 +2919,7 @@ resource "google_sql_database_instance" "instance" {
2901
2919
}` , databaseName , tier )
2902
2920
}
2903
2921
2904
- func testGoogleSqlDatabaseInstance_sqlMysqlDataCacheConfig (instanceName string ) string {
2922
+ func testGoogleSqlDatabaseInstance_sqlMysqlDataCacheConfig (instanceName string , datacache bool ) string {
2905
2923
return fmt .Sprintf (`
2906
2924
2907
2925
resource "google_sql_database_instance" "instance" {
@@ -2913,13 +2931,13 @@ resource "google_sql_database_instance" "instance" {
2913
2931
tier = "db-perf-optimized-N-2"
2914
2932
edition = "ENTERPRISE_PLUS"
2915
2933
data_cache_config {
2916
- data_cache_enabled = true
2934
+ data_cache_enabled = "%t"
2917
2935
}
2918
2936
}
2919
- }` , instanceName )
2937
+ }` , instanceName , datacache )
2920
2938
}
2921
2939
2922
- func testGoogleSqlDatabaseInstance_sqlPostgresDataCacheConfig (instanceName , tier , edition string ) string {
2940
+ func testGoogleSqlDatabaseInstance_sqlPostgresDataCacheConfig (instanceName , tier , edition string , datacache bool ) string {
2923
2941
return fmt .Sprintf (`
2924
2942
2925
2943
resource "google_sql_database_instance" "instance" {
@@ -2931,10 +2949,10 @@ resource "google_sql_database_instance" "instance" {
2931
2949
tier = "%s"
2932
2950
edition = "%s"
2933
2951
data_cache_config {
2934
- data_cache_enabled = true
2952
+ data_cache_enabled = "%t"
2935
2953
}
2936
2954
}
2937
- }` , instanceName , tier , edition )
2955
+ }` , instanceName , tier , edition , datacache )
2938
2956
}
2939
2957
2940
2958
func testGoogleSqlDatabaseInstance_SqlServerTimezone (instance , rootPassword , timezone string ) string {
0 commit comments