Merge pull request #2163 from coreos/revert-2152-add-oem-scheme

prestist · web-flow · commit c43db7103f8c · 2025-11-20T13:43:12.000-05:00
Revert "Add `oem` to accepted url schemes"
diff --git a/config/doc/ignition.yaml b/config/doc/ignition.yaml
@@ -1,7 +1,7 @@
 resource:
   children:
     - name: source
-      desc: "the URL of the %TYPE%. Supported schemes are `http`, `https`, `tftp`, `s3`, `arn`, `gs`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified."
+      desc: "the URL of the %TYPE%. Supported schemes are `http`, `https`, `tftp`, `s3`, `arn`, `gs`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified."
       # source is typically required by validation, but some inclusion sites
       # will override this
       required: true
diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp", "oem":
+	case "http", "https", "tftp":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_0/types/url_test.go b/config/v3_0/types/url_test.go
@@ -66,18 +66,6 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("s3://bucket/key?versionId=aVersionHash"),
 			nil,
 		},
-		{
-			util.StrToPtr("oem:///example.txt"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///scripts/setup.sh"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///etc/custom.conf"),
-			nil,
-		},
 	}
 
 	for i, test := range tests {
diff --git a/config/v3_1/types/url.go b/config/v3_1/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp", "oem":
+	case "http", "https", "tftp":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_1/types/url_test.go b/config/v3_1/types/url_test.go
@@ -66,18 +66,6 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("s3://bucket/key?versionId=aVersionHash"),
 			nil,
 		},
-		{
-			util.StrToPtr("oem:///example.txt"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///scripts/setup.sh"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///etc/custom.conf"),
-			nil,
-		},
 	}
 
 	for i, test := range tests {
diff --git a/config/v3_2/types/url.go b/config/v3_2/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp", "gs", "oem":
+	case "http", "https", "tftp", "gs":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_2/types/url_test.go b/config/v3_2/types/url_test.go
@@ -70,18 +70,6 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("gs://bucket/object"),
 			nil,
 		},
-		{
-			util.StrToPtr("oem:///example.txt"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///scripts/setup.sh"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///etc/custom.conf"),
-			nil,
-		},
 	}
 
 	for i, test := range tests {
diff --git a/config/v3_3/types/url.go b/config/v3_3/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp", "gs", "oem":
+	case "http", "https", "tftp", "gs":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_3/types/url_test.go b/config/v3_3/types/url_test.go
@@ -70,18 +70,6 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("gs://bucket/object"),
 			nil,
 		},
-		{
-			util.StrToPtr("oem:///example.txt"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///scripts/setup.sh"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///etc/custom.conf"),
-			nil,
-		},
 	}
 
 	for i, test := range tests {
diff --git a/config/v3_4/types/url.go b/config/v3_4/types/url.go
@@ -32,7 +32,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp", "gs", "oem":
+	case "http", "https", "tftp", "gs":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_4/types/url_test.go b/config/v3_4/types/url_test.go
@@ -126,18 +126,6 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("gs://bucket/object"),
 			nil,
 		},
-		{
-			util.StrToPtr("oem:///example.txt"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///scripts/setup.sh"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///etc/custom.conf"),
-			nil,
-		},
 	}
 
 	for i, test := range tests {
diff --git a/config/v3_5/types/url.go b/config/v3_5/types/url.go
@@ -32,7 +32,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp", "gs", "oem":
+	case "http", "https", "tftp", "gs":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_5/types/url_test.go b/config/v3_5/types/url_test.go
@@ -126,18 +126,6 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("gs://bucket/object"),
 			nil,
 		},
-		{
-			util.StrToPtr("oem:///example.txt"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///scripts/setup.sh"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///etc/custom.conf"),
-			nil,
-		},
 	}
 
 	for i, test := range tests {
diff --git a/config/v3_6_experimental/types/url.go b/config/v3_6_experimental/types/url.go
@@ -32,7 +32,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp", "gs", "oem":
+	case "http", "https", "tftp", "gs":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_6_experimental/types/url_test.go b/config/v3_6_experimental/types/url_test.go
@@ -126,18 +126,6 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("gs://bucket/object"),
 			nil,
 		},
-		{
-			util.StrToPtr("oem:///example.txt"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///scripts/setup.sh"),
-			nil,
-		},
-		{
-			util.StrToPtr("oem:///etc/custom.conf"),
-			nil,
-		},
 	}
 
 	for i, test := range tests {
diff --git a/docs/configuration-v3_0.md b/docs/configuration-v3_0.md
@@ -16,11 +16,11 @@ The Ignition configuration is a JSON document conforming to the following specif
   * **version** (string): the semantic version number of the spec. The spec version must be compatible with the latest version (`3.0.0`). Compatibility requires the major versions to match and the spec version be less than or equal to the latest version. `-experimental` versions compare less than the final version with the same number, and previous experimental versions are not accepted.
   * **_config_** (object): options related to the configuration.
     * **_merge_** (list of objects): a list of the configs to be merged to the current config.
-      * **source** (string): the URL of the config. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
+      * **source** (string): the URL of the config. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
       * **_verification_** (object): options related to the verification of the config.
         * **_hash_** (string): the hash of the config, in the form `<type>-<value>` where type is `sha512`.
     * **_replace_** (object): the config that will replace the current.
-      * **source** (string): the URL of the config. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
+      * **source** (string): the URL of the config. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
       * **_verification_** (object): options related to the verification of the config.
         * **_hash_** (string): the hash of the config, in the form `<type>-<value>` where type is `sha512`.
   * **_timeouts_** (object): options relating to `http` timeouts when fetching files over `http` or `https`.
@@ -29,7 +29,7 @@ The Ignition configuration is a JSON document conforming to the following specif
   * **_security_** (object): options relating to network security.
     * **_tls_** (object): options relating to TLS when fetching resources over `https`.
       * **_certificateAuthorities_** (list of objects): the list of additional certificate authorities (in addition to the system authorities) to be used for TLS verification when fetching over `https`. All certificate authorities must have a unique `source`.
-        * **source** (string): the URL of the certificate bundle (in PEM format). The bundle can contain multiple concatenated certificates. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
+        * **source** (string): the URL of the certificate bundle (in PEM format). The bundle can contain multiple concatenated certificates. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
         * **_verification_** (object): options related to the verification of the certificate bundle.
           * **_hash_** (string): the hash of the certificate bundle, in the form `<type>-<value>` where type is `sha512`.
 * **_storage_** (object): describes the desired state of the system's storage devices.
@@ -63,12 +63,12 @@ The Ignition configuration is a JSON document conforming to the following specif
     * **path** (string): the absolute path to the file.
     * **_overwrite_** (boolean): whether to delete preexisting nodes at the path. `contents` must be specified if `overwrite` is true. Defaults to false.
     * **_contents_** (object): options related to the contents of the file.
-      * **_source_** (string): the URL of the file. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified. If source is omitted and a regular file already exists at the path, Ignition will do nothing. If source is omitted and no file exists, an empty file will be created.
+      * **_source_** (string): the URL of the file. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified. If source is omitted and a regular file already exists at the path, Ignition will do nothing. If source is omitted and no file exists, an empty file will be created.
       * **_compression_** (string): the type of compression used on the file (null or gzip). Compression cannot be used with S3.
       * **_verification_** (object): options related to the verification of the file.
         * **_hash_** (string): the hash of the file, in the form `<type>-<value>` where type is `sha512`. If `compression` is specified, the hash describes the decompressed file.
     * **_append_** (list of objects): list of fragments to be appended to the file. Follows the same structure as `contents`.
-      * **_source_** (string): the URL of the fragment. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
+      * **_source_** (string): the URL of the fragment. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
       * **_compression_** (string): the type of compression used on the fragment (null or gzip). Compression cannot be used with S3.
       * **_verification_** (object): options related to the verification of the fragment.
         * **_hash_** (string): the hash of the fragment, in the form `<type>-<value>` where type is `sha512`. If `compression` is specified, the hash describes the decompressed fragment.
diff --git a/docs/configuration-v3_1.md b/docs/configuration-v3_1.md
@@ -16,15 +16,15 @@ The Ignition configuration is a JSON document conforming to the following specif
   * **version** (string): the semantic version number of the spec. The spec version must be compatible with the latest version (`3.1.0`). Compatibility requires the major versions to match and the spec version be less than or equal to the latest version. `-experimental` versions compare less than the final version with the same number, and previous experimental versions are not accepted.
   * **_config_** (object): options related to the configuration.
     * **_merge_** (list of objects): a list of the configs to be merged to the current config.
-      * **source** (string): the URL of the config. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
+      * **source** (string): the URL of the config. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
       * **_compression_** (string): the type of compression used on the config (null or gzip). Compression cannot be used with S3.
       * **_httpHeaders_** (list of objects): a list of HTTP headers to be added to the request. Available for `http` and `https` source schemes only.
         * **name** (string): the header name.
         * **_value_** (string): the header contents.
       * **_verification_** (object): options related to the verification of the config.
         * **_hash_** (string): the hash of the config, in the form `<type>-<value>` where type is either `sha512` or `sha256`. If `compression` is specified, the hash describes the decompressed config.
     * **_replace_** (object): the config that will replace the current.
-      * **source** (string): the URL of the config. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
+      * **source** (string): the URL of the config. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
       * **_compression_** (string): the type of compression used on the config (null or gzip). Compression cannot be used with S3.
       * **_httpHeaders_** (list of objects): a list of HTTP headers to be added to the request. Available for `http` and `https` source schemes only.
         * **name** (string): the header name.
@@ -37,7 +37,7 @@ The Ignition configuration is a JSON document conforming to the following specif
   * **_security_** (object): options relating to network security.
     * **_tls_** (object): options relating to TLS when fetching resources over `https`.
       * **_certificateAuthorities_** (list of objects): the list of additional certificate authorities (in addition to the system authorities) to be used for TLS verification when fetching over `https`. All certificate authorities must have a unique `source`.
-        * **source** (string): the URL of the certificate bundle (in PEM format). The bundle can contain multiple concatenated certificates. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
+        * **source** (string): the URL of the certificate bundle (in PEM format). The bundle can contain multiple concatenated certificates. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
         * **_compression_** (string): the type of compression used on the certificate bundle (null or gzip). Compression cannot be used with S3.
         * **_httpHeaders_** (list of objects): a list of HTTP headers to be added to the request. Available for `http` and `https` source schemes only.
           * **name** (string): the header name.
@@ -80,15 +80,15 @@ The Ignition configuration is a JSON document conforming to the following specif
     * **path** (string): the absolute path to the file.
     * **_overwrite_** (boolean): whether to delete preexisting nodes at the path. `contents` must be specified if `overwrite` is true. Defaults to false.
     * **_contents_** (object): options related to the contents of the file.
-      * **_source_** (string): the URL of the file. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified. If source is omitted and a regular file already exists at the path, Ignition will do nothing. If source is omitted and no file exists, an empty file will be created.
+      * **_source_** (string): the URL of the file. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified. If source is omitted and a regular file already exists at the path, Ignition will do nothing. If source is omitted and no file exists, an empty file will be created.
       * **_compression_** (string): the type of compression used on the file (null or gzip). Compression cannot be used with S3.
       * **_httpHeaders_** (list of objects): a list of HTTP headers to be added to the request. Available for `http` and `https` source schemes only.
         * **name** (string): the header name.
         * **_value_** (string): the header contents.
       * **_verification_** (object): options related to the verification of the file.
         * **_hash_** (string): the hash of the file, in the form `<type>-<value>` where type is either `sha512` or `sha256`. If `compression` is specified, the hash describes the decompressed file.
     * **_append_** (list of objects): list of fragments to be appended to the file. Follows the same structure as `contents`.
-      * **_source_** (string): the URL of the fragment. Supported schemes are `http`, `https`, `tftp`, `s3`, `oem` (Flatcar only), and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
+      * **_source_** (string): the URL of the fragment. Supported schemes are `http`, `https`, `tftp`, `s3`, and [`data`](https://tools.ietf.org/html/rfc2397). When using `http`, it is advisable to use the verification option to ensure the contents haven't been modified.
       * **_compression_** (string): the type of compression used on the fragment (null or gzip). Compression cannot be used with S3.
       * **_httpHeaders_** (list of objects): a list of HTTP headers to be added to the request. Available for `http` and `https` source schemes only.
         * **name** (string): the header name.
diff --git a/docs/configuration-v3_2.md b/docs/configuration-v3_2.md
diff --git a/docs/configuration-v3_3.md b/docs/configuration-v3_3.md
diff --git a/docs/configuration-v3_4.md b/docs/configuration-v3_4.md
diff --git a/docs/configuration-v3_5.md b/docs/configuration-v3_5.md
diff --git a/docs/configuration-v3_6_experimental.md b/docs/configuration-v3_6_experimental.md
diff --git a/docs/release-notes.md b/docs/release-notes.md

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func validateURL(s string) error {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`switch u.Scheme {`
`33`		`- case "http", "https", "tftp", "oem":`
	`33`	`+ case "http", "https", "tftp":`
`34`	`34`	`return nil`
`35`	`35`	`case "s3":`
`36`	`36`	`if v, ok := u.Query()["versionId"]; ok {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func validateURL(s string) error {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`switch u.Scheme {`
`35`		`- case "http", "https", "tftp", "gs", "oem":`
	`35`	`+ case "http", "https", "tftp", "gs":`
`36`	`36`	`return nil`
`37`	`37`	`case "s3":`
`38`	`38`	`if v, ok := u.Query()["versionId"]; ok {`