fix: Snowflake Provider version less strict

edulop · edulop · commit 68ab717a5491 · 2021-01-07T22:01:21.000-05:00
diff --git a/scripts/snowflake_generate_grant_all/main.go b/scripts/snowflake_generate_grant_all/main.go
@@ -26,7 +26,7 @@ const (
 	perPrivTypeVarName string = "per_privilege_grants"
 
 	// TODO(el): grab this version directly from the provider
-	snowflakeProviderVersion string = "~> 0.20.0"
+	snowflakeProviderVersion string = ">= 0.20.0"
 )
 
 type Variable struct {
@@ -224,6 +224,7 @@ func reverseType(s *schema.Schema) (string, error) {
 				return "", err
 			}
 			innerElements = append(innerElements, fmt.Sprintf("%s = %s", name, inner))
+			sort.Strings(innerElements)
 		}
 		return fmt.Sprintf("list(object({ %s }))", strings.Join(innerElements, ", ")), nil
 	default:
diff --git a/snowflake-account-grant-all/README.md b/snowflake-account-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-account-grant-all/main.tf.json b/snowflake-account-grant-all/main.tf.json
@@ -44,7 +44,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-database-grant-all/README.md b/snowflake-database-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-database-grant-all/main.tf.json b/snowflake-database-grant-all/main.tf.json
@@ -54,7 +54,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-external-table-grant-all/main.tf.json b/snowflake-external-table-grant-all/main.tf.json
@@ -67,7 +67,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-file-format-grant-all/main.tf.json b/snowflake-file-format-grant-all/main.tf.json
@@ -61,7 +61,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-function-grant-all/main.tf.json b/snowflake-function-grant-all/main.tf.json
@@ -79,7 +79,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-integration-grant-all/README.md b/snowflake-integration-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-integration-grant-all/main.tf.json b/snowflake-integration-grant-all/main.tf.json
@@ -43,7 +43,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-materialized-view-grant-all/main.tf.json b/snowflake-materialized-view-grant-all/main.tf.json
@@ -67,7 +67,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-procedure-grant-all/main.tf.json b/snowflake-procedure-grant-all/main.tf.json
@@ -79,7 +79,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-resource-monitor-grant-all/README.md b/snowflake-resource-monitor-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-resource-monitor-grant-all/main.tf.json b/snowflake-resource-monitor-grant-all/main.tf.json
@@ -43,7 +43,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-schema-grant-all/README.md b/snowflake-schema-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-schema-grant-all/main.tf.json b/snowflake-schema-grant-all/main.tf.json
@@ -78,7 +78,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-sequence-grant-all/main.tf.json b/snowflake-sequence-grant-all/main.tf.json
@@ -61,7 +61,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-stage-grant-all/README.md b/snowflake-stage-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-stage-grant-all/main.tf.json b/snowflake-stage-grant-all/main.tf.json
@@ -69,7 +69,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-stream-grant-all/main.tf.json b/snowflake-stream-grant-all/main.tf.json
@@ -61,7 +61,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-table-grant-all/README.md b/snowflake-table-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-table-grant-all/main.tf.json b/snowflake-table-grant-all/main.tf.json
@@ -72,7 +72,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-view-grant-all/README.md b/snowflake-view-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-view-grant-all/main.tf.json b/snowflake-view-grant-all/main.tf.json
@@ -67,7 +67,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }
diff --git a/snowflake-warehouse-grant-all/README.md b/snowflake-warehouse-grant-all/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| snowflake | ~> 0.20.0 |
+| snowflake | >= 0.20.0 |
 
 ## Inputs
 
diff --git a/snowflake-warehouse-grant-all/main.tf.json b/snowflake-warehouse-grant-all/main.tf.json
@@ -46,7 +46,7 @@
     "required_providers": {
       "snowflake": {
         "source": "chanzuckerberg/snowflake",
-        "version": "~\u003e 0.20.0"
+        "version": "\u003e= 0.20.0"
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ const (`
`26`	`26`	`perPrivTypeVarName string = "per_privilege_grants"`
`27`	`27`
`28`	`28`	`// TODO(el): grab this version directly from the provider`
`29`		`- snowflakeProviderVersion string = "~> 0.20.0"`
	`29`	`+ snowflakeProviderVersion string = ">= 0.20.0"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`type Variable struct {`
`@@ -224,6 +224,7 @@ func reverseType(s *schema.Schema) (string, error) {`
`224`	`224`	`return "", err`
`225`	`225`	`}`
`226`	`226`	`innerElements = append(innerElements, fmt.Sprintf("%s = %s", name, inner))`
	`227`	`+ sort.Strings(innerElements)`
`227`	`228`	`}`
`228`	`229`	`return fmt.Sprintf("list(object({ %s }))", strings.Join(innerElements, ", ")), nil`
`229`	`230`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`"required_providers": {`
`45`	`45`	`"snowflake": {`
`46`	`46`	`"source": "chanzuckerberg/snowflake",`
`47`		`- "version": "~\u003e 0.20.0"`
	`47`	`+ "version": "\u003e= 0.20.0"`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`"required_providers": {`
`55`	`55`	`"snowflake": {`
`56`	`56`	`"source": "chanzuckerberg/snowflake",`
`57`		`- "version": "~\u003e 0.20.0"`
	`57`	`+ "version": "\u003e= 0.20.0"`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`"required_providers": {`
`68`	`68`	`"snowflake": {`
`69`	`69`	`"source": "chanzuckerberg/snowflake",`
`70`		`- "version": "~\u003e 0.20.0"`
	`70`	`+ "version": "\u003e= 0.20.0"`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`"required_providers": {`
`62`	`62`	`"snowflake": {`
`63`	`63`	`"source": "chanzuckerberg/snowflake",`
`64`		`- "version": "~\u003e 0.20.0"`
	`64`	`+ "version": "\u003e= 0.20.0"`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@`
`79`	`79`	`"required_providers": {`
`80`	`80`	`"snowflake": {`
`81`	`81`	`"source": "chanzuckerberg/snowflake",`
`82`		`- "version": "~\u003e 0.20.0"`
	`82`	`+ "version": "\u003e= 0.20.0"`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`"required_providers": {`
`44`	`44`	`"snowflake": {`
`45`	`45`	`"source": "chanzuckerberg/snowflake",`
`46`		`- "version": "~\u003e 0.20.0"`
	`46`	`+ "version": "\u003e= 0.20.0"`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`"required_providers": {`
`79`	`79`	`"snowflake": {`
`80`	`80`	`"source": "chanzuckerberg/snowflake",`
`81`		`- "version": "~\u003e 0.20.0"`
	`81`	`+ "version": "\u003e= 0.20.0"`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`	`"required_providers": {`
`70`	`70`	`"snowflake": {`
`71`	`71`	`"source": "chanzuckerberg/snowflake",`
`72`		`- "version": "~\u003e 0.20.0"`
	`72`	`+ "version": "\u003e= 0.20.0"`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`"required_providers": {`
`73`	`73`	`"snowflake": {`
`74`	`74`	`"source": "chanzuckerberg/snowflake",`
`75`		`- "version": "~\u003e 0.20.0"`
	`75`	`+ "version": "\u003e= 0.20.0"`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`