fix comments

Author: fivetran-aleksandrboldyrev

docs/data-sources/connectors.md

@@ -36,7 +36,6 @@ Read-Only:
 - `group_id` (String) The unique identifier for the Group (Destination) within the Fivetran system.
 - `hybrid_deployment_agent_id` (String) The hybrid deployment agent ID that refers to the controller created for the group the connection belongs to. If the value is specified, the system will try to associate the connection with an existing agent.
 - `id` (String) The unique identifier for the connector within the Fivetran system.
-- `local_processing_agent_id` (String) (Deprecated) The hybrid deployment agent ID that refers to the controller created for the group the connection belongs to. If the value is specified, the system will try to associate the connection with an existing agent.
 - `name` (String) The name used both as the connector's name within the Fivetran system and as the source schema's name within your destination.
 - `networking_method` (String) Possible values: Directly, SshTunnel, ProxyAgent.
 - `pause_after_trial` (Boolean) Specifies whether the connector should be paused after the free trial period has ended.

docs/data-sources/destinations.md

@@ -31,7 +31,6 @@ Read-Only:
 - `group_id` (String) The unique identifier for the Group within the Fivetran system.
 - `hybrid_deployment_agent_id` (String) The hybrid deployment agent ID that refers to the controller created for the group the connection belongs to. If the value is specified, the system will try to associate the connection with an existing agent.
 - `id` (String) The unique identifier for the destination within the Fivetran system.
-- `local_processing_agent_id` (String) (Deprecated) The hybrid deployment agent ID that refers to the controller created for the group the connection belongs to. If the value is specified, the system will try to associate the connection with an existing agent.
 - `networking_method` (String) Possible values: Directly, SshTunnel, ProxyAgent.
 - `private_link_id` (String) The private link ID.
 - `region` (String) Data processing location. This is where Fivetran will operate and run computation on data.

fivetran/framework/core/model/connectors.go

@@ -34,7 +34,6 @@ func (d *Connectors) ReadFromResponse(ctx context.Context, resp connectors.Conne
         "data_delay_threshold":         types.Int64Type,
         "proxy_agent_id":               types.StringType,
         "networking_method":            types.StringType,
-        "local_processing_agent_id":    types.StringType,
         "hybrid_deployment_agent_id":   types.StringType,
         "private_link_id":              types.StringType,
     }
@@ -65,7 +64,6 @@ func (d *Connectors) ReadFromResponse(ctx context.Context, resp connectors.Conne
         item["data_delay_threshold"] = types.Int64Value(int64(*v.DataDelayThreshold))
         item["proxy_agent_id"] = types.StringValue(v.ProxyAgentId)
         item["networking_method"] = types.StringValue(v.NetworkingMethod)
-        item["local_processing_agent_id"] = types.StringValue(v.HybridDeploymentAgentId)
         item["hybrid_deployment_agent_id"] = types.StringValue(v.HybridDeploymentAgentId)
         item["private_link_id"] = types.StringValue(v.PrivateLinkId)
 

fivetran/framework/core/model/destinations.go

@@ -22,7 +22,6 @@ func (d *Destinations) ReadFromResponse(ctx context.Context, resp destinations.D
         "time_zone_offset":             types.StringType,
         "setup_status":                 types.StringType,
         "networking_method":            types.StringType,
-        "local_processing_agent_id":    types.StringType,
         "hybrid_deployment_agent_id":   types.StringType,
         "private_link_id":              types.StringType,
         "daylight_saving_time_enabled": types.BoolType,
@@ -43,7 +42,6 @@ func (d *Destinations) ReadFromResponse(ctx context.Context, resp destinations.D
         item["time_zone_offset"] = types.StringValue(v.TimeZoneOffset)
         item["setup_status"] = types.StringValue(v.SetupStatus)
         item["private_link_id"] = types.StringValue(v.PrivateLinkId)
-        item["local_processing_agent_id"] = types.StringValue(v.HybridDeploymentAgentId)
         item["hybrid_deployment_agent_id"] = types.StringValue(v.HybridDeploymentAgentId)
         item["networking_method"] = types.StringValue(v.NetworkingMethod)
         item["daylight_saving_time_enabled"] = types.BoolValue(v.DaylightSavingTimeEnabled)

fivetran/framework/datasources/connectors_test.go

@@ -39,7 +39,6 @@ const (
         "data_delay_threshold": 0,
         "data_delay_sensitivity": "LOW",
         "schedule_type": "auto",
-        "local_processing_agent_id": "string",
         "hybrid_deployment_agent_id": "string"
       }
     ],
@@ -70,7 +69,6 @@ const (
         "data_delay_threshold": 0,
         "data_delay_sensitivity": "LOW",
         "schedule_type": "auto",
-        "local_processing_agent_id": "string",
         "hybrid_deployment_agent_id": "string"
       }
     ],

fivetran/framework/resources/connector_migrations.go

@@ -35,9 +35,13 @@ func upgradeConnectorState(ctx context.Context, req resource.UpgradeStateRequest
 		return
 	}
 
-	lpaValue := tftypes.NewValue(tftypes.String, nil)
+	resultValue := tftypes.NewValue(tftypes.String, nil)
 	if fromVersion == 3 || fromVersion == 4 {
-		lpaValue = rawState["local_processing_agent_id"]
+		if !rawState["hybrid_deployment_agent_id"].IsNull() {
+			resultValue = rawState["hybrid_deployment_agent_id"]
+		} else if !rawState["local_processing_agent_id"].IsNull() {
+			resultValue = rawState["local_processing_agent_id"]
+		}
 	}
 
 	dynamicValue, err := tfprotov6.NewDynamicValue(
@@ -55,7 +59,7 @@ func upgradeConnectorState(ctx context.Context, req resource.UpgradeStateRequest
 			"private_link_id":           tftypes.NewValue(tftypes.String, nil),
 			"data_delay_sensitivity":    tftypes.NewValue(tftypes.String, nil),
 			"data_delay_threshold":      tftypes.NewValue(tftypes.Number, nil),
-			"hybrid_deployment_agent_id": lpaValue,
+			"hybrid_deployment_agent_id": resultValue,
 			"run_setup_tests":    convertStringStateValueToBool("run_setup_tests", rawState["run_setup_tests"], resp.Diagnostics),
 			"trust_fingerprints": convertStringStateValueToBool("trust_fingerprints", rawState["trust_fingerprints"], resp.Diagnostics),
 			"trust_certificates": convertStringStateValueToBool("trust_certificates", rawState["trust_certificates"], resp.Diagnostics),

fivetran/framework/resources/destination.go

@@ -59,6 +59,11 @@ func (r *destination) UpgradeState(ctx context.Context) map[int64]resource.State
 				upgradeDestinationState(ctx, req, resp, 2)
 			},
 		},
+		3: {
+			StateUpgrader: func(ctx context.Context, req resource.UpgradeStateRequest, resp *resource.UpgradeStateResponse) {
+				upgradeDestinationState(ctx, req, resp, 3)
+			},
+		},
 	}
 }
 

fivetran/framework/resources/destination_migrations.go

@@ -31,9 +31,18 @@ func upgradeDestinationState(ctx context.Context, req resource.UpgradeStateReque
 		return
 	}
 
+	resultValue := tftypes.NewValue(tftypes.String, nil)
+	if fromVersion == 1 || fromVersion == 2 {
+		if !rawState["hybrid_deployment_agent_id"].IsNull() {
+			resultValue = rawState["hybrid_deployment_agent_id"]
+		} else if !rawState["local_processing_agent_id"].IsNull() {
+			resultValue = rawState["local_processing_agent_id"]
+		}
+	}
+
 	dynamicValue, err := tfprotov6.NewDynamicValue(
-		getDestinationStateModel(3),
-		tftypes.NewValue(getDestinationStateModel(3), map[string]tftypes.Value{
+		getDestinationStateModel(4),
+		tftypes.NewValue(getDestinationStateModel(4), map[string]tftypes.Value{
 			"id":                           rawState["id"],
 			"group_id":                     rawState["group_id"],
 			"service":                      rawState["service"],
@@ -44,7 +53,7 @@ func upgradeDestinationState(ctx context.Context, req resource.UpgradeStateReque
 			"daylight_saving_time_enabled": tftypes.NewValue(tftypes.Bool, nil),
 			"networking_method":            tftypes.NewValue(tftypes.String, nil),
             "private_link_id":              tftypes.NewValue(tftypes.String, nil),
-			"hybrid_deployment_agent_id":   rawState["hybrid_deployment_agent_id"],
+			"hybrid_deployment_agent_id":   resultValue,
 			"run_setup_tests":    convertStringStateValueToBool("run_setup_tests", rawState["run_setup_tests"], resp.Diagnostics),
 			"trust_fingerprints": convertStringStateValueToBool("trust_fingerprints", rawState["trust_fingerprints"], resp.Diagnostics),
 			"trust_certificates": convertStringStateValueToBool("trust_certificates", rawState["trust_certificates"], resp.Diagnostics),
@@ -75,7 +84,7 @@ func getDestinationStateModel(version int) tftypes.Type {
 			},
 		},
 	}
-	if version == 3 {
+	if version == 3 || version == 4 {
 		base["run_setup_tests"] = tftypes.Bool
 		base["trust_certificates"] = tftypes.Bool
 		base["trust_fingerprints"] = tftypes.Bool