Skip to content

Commit e76002d

Browse files
frezbofrezbo
committed
fix: factory installer urls
Use proper platform for installer urls. Signed-off-by: Noel Georgi <[email protected]>
1 parent 44eec1c commit e76002d

File tree

3 files changed

+12
-39
lines changed

3 files changed

+12
-39
lines changed

‎pkg/talos/talos_image_factory_urls_data_source.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,14 +275,14 @@ func (d *talosImageFactoryURLSDataSource) Read(ctx context.Context, req datasour
275275
}
276276

277277
urlsData := urls{
278-
Installer: basetypes.NewStringValue(fmt.Sprintf("%s/installer/%s:%s", uri.Host, schematicID, talosVersion)),
278+
Installer: basetypes.NewStringValue(fmt.Sprintf("%s/%s-installer/%s:%s", uri.Host, platform, schematicID, talosVersion)),
279279
}
280280

281281
switch platform {
282282
case "metal":
283283
platformData := platforms.MetalPlatform()
284284

285-
urlsData.InstallerSecureboot = basetypes.NewStringValue(fmt.Sprintf("%s/installer-secureboot/%s:%s", uri.Host, schematicID, talosVersion))
285+
urlsData.InstallerSecureboot = basetypes.NewStringValue(fmt.Sprintf("%s/%s-installer-secureboot/%s:%s", uri.Host, platform, schematicID, talosVersion))
286286
urlsData.ISO = basetypes.NewStringValue(fmt.Sprintf("%s/image/%s/%s/%s", d.imageFactoryClient.BaseURL(), schematicID, talosVersion, platformData.ISOPath(architecture)))
287287
urlsData.ISOSecureboot = basetypes.NewStringValue(fmt.Sprintf("%s/image/%s/%s/%s", d.imageFactoryClient.BaseURL(), schematicID, talosVersion, platformData.SecureBootISOPath(architecture)))
288288
urlsData.DiskImage = basetypes.NewStringValue(fmt.Sprintf("%s/image/%s/%s/%s", d.imageFactoryClient.BaseURL(), schematicID, talosVersion, platformData.DiskImageDefaultPath(architecture)))
@@ -295,6 +295,7 @@ func (d *talosImageFactoryURLSDataSource) Read(ctx context.Context, req datasour
295295
urlsData.Initramfs = basetypes.NewStringValue(fmt.Sprintf("%s/image/%s/%s/%s", d.imageFactoryClient.BaseURL(), schematicID, talosVersion, platformData.InitramfsPath(architecture)))
296296
urlsData.UKI = basetypes.NewStringValue(fmt.Sprintf("%s/image/%s/%s/%s", d.imageFactoryClient.BaseURL(), schematicID, talosVersion, platformData.SecureBootUKIPath(architecture)))
297297
case "": // empty platform means it's an SBC
298+
urlsData.Installer = basetypes.NewStringValue(fmt.Sprintf("%s/metal-installer/%s:%s", uri.Host, schematicID, talosVersion))
298299
urlsData.DiskImage = basetypes.NewStringValue(fmt.Sprintf("%s/image/%s/%s/metal-arm64.raw.xz", d.imageFactoryClient.BaseURL(), schematicID, talosVersion))
299300
default:
300301
platformData := xslices.Filter(platforms.CloudPlatforms(), func(p platforms.Platform) bool { return p.Name == platform })

‎pkg/talos/talos_image_factory_urls_data_source_test.go‎

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccTalosImageFactoryURLsDataSource(t *testing.T) {
3636
{
3737
Config: testAccTalosImageFactoryURLsMetalPlatformConfig(),
3838
Check: resource.ComposeAggregateTestCheckFunc(
39-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
40-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer_secureboot", "factory.talos.dev/installer-secureboot/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
39+
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/metal-installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
40+
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer_secureboot", "factory.talos.dev/metal-installer-secureboot/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
4141
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.iso", "https://factory.talos.dev/image/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/metal-amd64.iso"),
4242
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.iso_secureboot", "https://factory.talos.dev/image/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/metal-amd64-secureboot.iso"),
4343
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.disk_image", "https://factory.talos.dev/image/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/metal-amd64.raw.zst"),
@@ -53,8 +53,8 @@ func TestAccTalosImageFactoryURLsDataSource(t *testing.T) {
5353
{
5454
Config: testAccTalosImageFactoryURLsMetalPlatformArm64Config(),
5555
Check: resource.ComposeAggregateTestCheckFunc(
56-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
57-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer_secureboot", "factory.talos.dev/installer-secureboot/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
56+
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/metal-installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
57+
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer_secureboot", "factory.talos.dev/metal-installer-secureboot/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
5858
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.iso", "https://factory.talos.dev/image/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/metal-arm64.iso"),
5959
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.iso_secureboot", "https://factory.talos.dev/image/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/metal-arm64-secureboot.iso"),
6060
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.disk_image", "https://factory.talos.dev/image/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/metal-arm64.raw.zst"),
@@ -70,7 +70,7 @@ func TestAccTalosImageFactoryURLsDataSource(t *testing.T) {
7070
{
7171
Config: testAccTalosImageFactoryURLsAWSPlatformConfig(),
7272
Check: resource.ComposeAggregateTestCheckFunc(
73-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
73+
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/aws-installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
7474
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.installer_secureboot"),
7575
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.iso"),
7676
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.iso_secureboot"),
@@ -83,28 +83,12 @@ func TestAccTalosImageFactoryURLsDataSource(t *testing.T) {
8383
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.uki"),
8484
),
8585
},
86-
// equinixMetal platform
87-
{
88-
Config: testAccTalosImageFactoryURLsEquinixMetalPlatformConfig(),
89-
Check: resource.ComposeAggregateTestCheckFunc(
90-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
91-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.installer_secureboot"),
92-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.iso"),
93-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.iso_secureboot"),
94-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.disk_image"),
95-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.disk_image_secureboot"),
96-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.pxe", "https://pxe.factory.talos.dev/pxe/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/equinixMetal-amd64"),
97-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.kernel"),
98-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.kernel_command_line"),
99-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.initramfs"),
100-
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.uki"),
101-
),
102-
},
86+
10387
// nocloud platform
10488
{
10589
Config: testAccTalosImageFactoryURLsNoCloudPlatformConfig(),
10690
Check: resource.ComposeAggregateTestCheckFunc(
107-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
91+
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/nocloud-installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
10892
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer_secureboot", "factory.talos.dev/installer-secureboot/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.7.5"),
10993
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.iso", "https://factory.talos.dev/image/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/nocloud-amd64.iso"),
11094
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.iso_secureboot", "https://factory.talos.dev/image/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba/v1.7.5/nocloud-amd64-secureboot.iso"),
@@ -121,7 +105,7 @@ func TestAccTalosImageFactoryURLsDataSource(t *testing.T) {
121105
{
122106
Config: testAccTalosImageFactoryURLsSBCConfig(),
123107
Check: resource.ComposeAggregateTestCheckFunc(
124-
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/installer/ee21ef4a5ef808a9b7484cc0dda0f25075021691c8c09a276591eedb638ea1f9:v1.7.5"),
108+
resource.TestCheckResourceAttr("data.talos_image_factory_urls.this", "urls.installer", "factory.talos.dev/metal-installer/ee21ef4a5ef808a9b7484cc0dda0f25075021691c8c09a276591eedb638ea1f9:v1.7.5"),
125109
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.installer_secureboot"),
126110
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.iso"),
127111
resource.TestCheckNoResourceAttr("data.talos_image_factory_urls.this", "urls.iso_secureboot"),
@@ -199,18 +183,6 @@ data "talos_image_factory_urls" "this" {
199183
`
200184
}
201185

202-
func testAccTalosImageFactoryURLsEquinixMetalPlatformConfig() string {
203-
return `
204-
provider "talos" {}
205-
206-
data "talos_image_factory_urls" "this" {
207-
talos_version = "v1.7.5"
208-
schematic_id = "376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba"
209-
platform = "equinixMetal"
210-
}
211-
`
212-
}
213-
214186
func testAccTalosImageFactoryURLsNoCloudPlatformConfig() string {
215187
return `
216188
provider "talos" {}

‎pkg/talos/talos_image_factory_versions_data_source_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestAccTalosImageFactoryVersionsDataSource(t *testing.T) {
2626
{
2727
Config: testAccTalosImageFactoryVersionsDataSourceWithFilterConfig(),
2828
ConfigStateChecks: []statecheck.StateCheck{
29-
statecheck.ExpectKnownOutputValue("talos_version", knownvalue.StringExact("v1.10.0")),
29+
statecheck.ExpectKnownOutputValue("talos_version", knownvalue.StringExact("v1.10.1")),
3030
},
3131
},
3232
},

0 commit comments

Comments
 (0)