set image = builder_image if not exists

Author: johnstcn

internal/provider/cached_image_data_source.go

@@ -174,7 +174,7 @@ func (d *CachedImageDataSource) Schema(ctx context.Context, req datasource.Schem
 				Optional:            true,
 			},
 			"image": schema.StringAttribute{
-				MarkdownDescription: "Outputs the cached image URL if it exists, otherwise the builder image URL is output instead.",
+				MarkdownDescription: "Outputs the cached image URL if it exists, otherwise the builder image URL as output instead.",
 				Computed:            true,
 			},
 			"insecure": schema.BoolAttribute{
@@ -302,6 +302,8 @@ func (d *CachedImageDataSource) Read(ctx context.Context, req datasource.ReadReq
 	data.Exists = types.BoolValue(err == nil)
 	if err != nil {
 		resp.Diagnostics.AddWarning("Cached image not found", err.Error())
+		// TODO: Get the repo digest of the envbuilder image and use that as the ID
+		data.Image = data.BuilderImage
 	} else {
 		digest, err := image.Digest()
 		if err != nil {

internal/provider/cached_image_data_source_test.go

@@ -104,14 +104,14 @@ func TestAccCachedImageDataSource(t *testing.T) {
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "cache_repo", deps.CacheRepo),
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "extra_env.FOO", "bar"),
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "git_url", deps.RepoDir),
+						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "exists", "false"),
+						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "image", deps.BuilderImage),
 						// Should be empty
 						resource.TestCheckNoResourceAttr("data.envbuilder_cached_image.test", "git_username"),
 						resource.TestCheckNoResourceAttr("data.envbuilder_cached_image.test", "git_password"),
 						resource.TestCheckNoResourceAttr("data.envbuilder_cached_image.test", "cache_ttl_days"),
 						// Computed values should be empty.
 						resource.TestCheckNoResourceAttr("data.envbuilder_cached_image.test", "id"),
-						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "exists", "false"),
-						resource.TestCheckNoResourceAttr("data.envbuilder_cached_image.test", "image"),
 						resource.TestCheckResourceAttrSet("data.envbuilder_cached_image.test", "env.0"),
 					),
 				},