feat(provider): keep track of content-type update counts, use them as offsets to editor-interface versions

Author: cysp

internal/provider/content_type_resource.go

@@ -250,6 +250,8 @@ func (r *contentTypeResource) Update(ctx context.Context, req resource.UpdateReq
 
 	resp.Diagnostics.Append(util.PrivateDataSetValue(ctx, resp.Private, "version", currentVersion)...)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
+
+	r.providerData.editorInterfaceVersionOffset.Increment(data.ContentTypeId.ValueString())
 }
 
 //nolint:cyclop

internal/provider/editor_interface_resource.go

@@ -57,6 +57,7 @@ func (r *editorInterfaceResource) Create(ctx context.Context, req resource.Creat
 	}
 
 	currentVersion := 1
+	currentVersion += r.providerData.editorInterfaceVersionOffset.Get(data.ContentTypeId.ValueString())
 
 	params := contentfulManagement.PutEditorInterfaceParams{
 		SpaceID:            data.SpaceId.ValueString(),
@@ -92,6 +93,8 @@ func (r *editorInterfaceResource) Create(ctx context.Context, req resource.Creat
 
 	resp.Diagnostics.Append(util.PrivateDataSetValue(ctx, resp.Private, "version", currentVersion)...)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
+
+	r.providerData.editorInterfaceVersionOffset.Reset(data.ContentTypeId.ValueString())
 }
 
 func (r *editorInterfaceResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
@@ -143,6 +146,8 @@ func (r *editorInterfaceResource) Read(ctx context.Context, req resource.ReadReq
 
 	resp.Diagnostics.Append(util.PrivateDataSetValue(ctx, resp.Private, "version", currentVersion)...)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
+
+	r.providerData.editorInterfaceVersionOffset.Reset(data.ContentTypeId.ValueString())
 }
 
 func (r *editorInterfaceResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
@@ -158,6 +163,8 @@ func (r *editorInterfaceResource) Update(ctx context.Context, req resource.Updat
 	currentVersionDiags := util.PrivateDataGetValue(ctx, req.Private, "version", &currentVersion)
 	resp.Diagnostics.Append(currentVersionDiags...)
 
+	currentVersion += r.providerData.editorInterfaceVersionOffset.Get(data.ContentTypeId.ValueString())
+
 	params := contentfulManagement.PutEditorInterfaceParams{
 		SpaceID:            data.SpaceId.ValueString(),
 		EnvironmentID:      data.EnvironmentId.ValueString(),
@@ -196,6 +203,8 @@ func (r *editorInterfaceResource) Update(ctx context.Context, req resource.Updat
 
 	resp.Diagnostics.Append(util.PrivateDataSetValue(ctx, resp.Private, "version", currentVersion)...)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
+
+	r.providerData.editorInterfaceVersionOffset.Reset(data.ContentTypeId.ValueString())
 }
 
 func (r *editorInterfaceResource) Delete(_ context.Context, _ resource.DeleteRequest, _ *resource.DeleteResponse) {

internal/provider/provider.go

@@ -89,8 +89,13 @@ func (p *ContentfulProvider) Configure(ctx context.Context, req provider.Configu
 		resp.Diagnostics.AddError("Failed to create Contentful client: %s", err.Error())
 	}
 
-	resp.DataSourceData = ContentfulProviderData{client: contentfulManagementClient}
-	resp.ResourceData = ContentfulProviderData{client: contentfulManagementClient}
+	providerData := ContentfulProviderData{
+		client:                       contentfulManagementClient,
+		editorInterfaceVersionOffset: &ContentfulContentTypeCounter{},
+	}
+
+	resp.DataSourceData = providerData
+	resp.ResourceData = providerData
 }
 
 func (p *ContentfulProvider) Metadata(_ context.Context, _ provider.MetadataRequest, resp *provider.MetadataResponse) {

internal/provider/provider_data.go

@@ -6,4 +6,30 @@ import (
 
 type ContentfulProviderData struct {
 	client *contentfulManagement.Client
+
+	editorInterfaceVersionOffset *ContentfulContentTypeCounter
+}
+
+type ContentfulContentTypeCounter struct {
+	m map[string]int
+}
+
+func (c *ContentfulContentTypeCounter) getOrCreateMap() map[string]int {
+	if c.m == nil {
+		c.m = make(map[string]int)
+	}
+
+	return c.m
+}
+
+func (c *ContentfulContentTypeCounter) Get(contentTypeID string) int {
+	return c.getOrCreateMap()[contentTypeID]
+}
+
+func (c *ContentfulContentTypeCounter) Reset(contentTypeID string) {
+	delete(c.getOrCreateMap(), contentTypeID)
+}
+
+func (c *ContentfulContentTypeCounter) Increment(contentTypeID string) {
+	c.getOrCreateMap()[contentTypeID]++
 }