@terraforge/terraform 0.0.15 → 0.0.18

package/dist/index.d.mts

@@ -36,11 +36,11 @@ type Plugin = Readonly<{
   readResource: (type: string, state: State$1) => Promise<State$1>;
   readDataSource: (type: string, state: State$1) => Promise<State$1>;
   validateResource: (type: string, state: State$1) => Promise<void>;
-  planResourceChange: (type: string, priorState: State$1 | null, proposedNewState: State$1 | null) => Promise<{
+  planResourceChange: (type: string, priorState: State$1 | null, proposedNewState: State$1 | null, configState: State$1 | null) => Promise<{
     requiresReplace: Array<string | number>[];
     plannedState: State$1;
   }>;
-  applyResourceChange: (type: string, priorState: State$1 | null, proposedNewState: State$1 | null) => Promise<State$1>;
+  applyResourceChange: (type: string, priorState: State$1 | null, plannedState: State$1 | null, configState: State$1 | null) => Promise<State$1>;
 }>;
 //#endregion
 //#region ../core/src/future.d.ts

package/dist/index.mjs

@@ -257,25 +257,29 @@ var TerraformProvider = class {
 	async createResource({ type, state }) {
 		return {
 			version: 0,
-			state: await (await this.configure()).applyResourceChange(type, null, state)
+			state: await (await this.configure()).applyResourceChange(type, null, state, state)
 		};
 	}
 	async updateResource({ type, priorState, proposedState }) {
 		const plugin = await this.configure();
-		const { requiresReplace } = await plugin.planResourceChange(type, priorState, proposedState);
+		const mergedState = {
+			...priorState,
+			...proposedState
+		};
+		const { requiresReplace, plannedState } = await plugin.planResourceChange(type, priorState, mergedState, proposedState);
 		if (requiresReplace.length > 0) {
 			const formattedAttrs = requiresReplace.map((p) => p.join(".")).join("\", \"");
 			throw new Error(`Updating the "${formattedAttrs}" properties for the "${type}" resource will require the resource to be replaced.`);
 		}
 		return {
 			version: 0,
-			state: await plugin.applyResourceChange(type, priorState, proposedState)
+			state: await plugin.applyResourceChange(type, priorState, plannedState, proposedState)
 		};
 	}
 	async deleteResource({ type, state }) {
 		const plugin = await this.configure();
 		try {
-			await plugin.applyResourceChange(type, state, null);
+			await plugin.applyResourceChange(type, state, null, null);
 		} catch (error) {
 			try {
 				if (!await plugin.readResource(type, state)) throw new ResourceNotFound();
@@ -284,7 +288,12 @@ var TerraformProvider = class {
 		}
 	}
 	async planResourceChange({ type, priorState, proposedState }) {
-		const result = await (await this.configure()).planResourceChange(type, priorState, proposedState);
+		const plugin = await this.configure();
+		const mergedState = {
+			...priorState,
+			...proposedState
+		};
+		const result = await plugin.planResourceChange(type, priorState, mergedState, proposedState);
 		return {
 			version: 0,
 			requiresReplacement: result.requiresReplace.length > 0,
@@ -1966,6 +1975,23 @@ const formatAttributePath = (state) => {
 		});
 	});
 };
+const getNestedValue = (obj, path) => {
+	let current = obj;
+	for (const key of path) {
+		if (current === null || current === void 0) return current;
+		if (Array.isArray(current)) current = current[key];
+		else if (typeof current === "object") current = current[key];
+		else return;
+	}
+	return current;
+};
+const filterRequiresReplace = (paths, priorState, proposedState) => {
+	return paths.filter((path) => {
+		const priorValue = getNestedValue(priorState, path);
+		const proposedValue = getNestedValue(proposedState, path);
+		return JSON.stringify(priorValue) !== JSON.stringify(proposedValue);
+	});
+};
 var IncorrectType = class extends TypeError {
 	constructor(type, path) {
 		super(`${path.join(".")} should be a ${type}`);
@@ -2018,7 +2044,7 @@ const formatInputState = (schema, state, includeSchemaFields = true, path = [])
 	throw new Error(`Unknown schema type: ${schema.type}`);
 };
 const formatOutputState = (schema, state, path = []) => {
-	if (state === null) return;
+	if (state === null) return null;
 	if (schema.type === "array") {
 		if (Array.isArray(state)) return state.map((item, i) => formatOutputState(schema.item, item, [...path, i]));
 		throw new IncorrectType(schema.type, path);
@@ -2050,7 +2076,7 @@ const formatOutputState = (schema, state, path = []) => {
 				object[camelCase(key)] = formatOutputState(prop, value, [...path, key]);
 			}
 			return object;
-		} else return;
+		} else return null;
 		throw new IncorrectType(schema.type, path);
 	}
 	return state;
@@ -2100,39 +2126,33 @@ const createPlugin5 = async ({ server, client }) => {
 				config: encodeDynamicValue(formatInputState(schema$1, state))
 			});
 		},
-		async planResourceChange(type, priorState, proposedState) {
+		async planResourceChange(type, priorState, proposedState, configState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, {
-				...priorState,
-				...proposedState
-			});
-			const configState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedConfigState = formatInputState(schema$1, configState);
 			const plan = await client.call("PlanResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				proposedNewState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(configState)
+				config: encodeDynamicValue(preparedConfigState)
 			});
 			const plannedState = decodeDynamicValue(plan.plannedState);
 			return {
-				requiresReplace: formatAttributePath(plan.requiresReplace),
+				requiresReplace: filterRequiresReplace(formatAttributePath(plan.requiresReplace), preparedPriorState, preparedProposedState),
 				plannedState
 			};
 		},
-		async applyResourceChange(type, priorState, proposedState) {
+		async applyResourceChange(type, priorState, plannedState, configState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, {
-				...priorState,
-				...proposedState
-			});
-			const configState = formatInputState(schema$1, proposedState);
+			const preparedPlannedState = formatInputState(schema$1, plannedState);
+			const preparedConfigState = formatInputState(schema$1, configState);
 			return formatOutputState(schema$1, decodeDynamicValue((await client.call("ApplyResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
-				plannedState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(configState)
+				plannedState: encodeDynamicValue(preparedPlannedState),
+				config: encodeDynamicValue(preparedConfigState)
 			})).newState));
 		}
 	};
@@ -2185,10 +2205,7 @@ const createPlugin6 = async ({ server, client }) => {
 		async planResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, {
-				...priorState,
-				...proposedState
-			});
+			const preparedProposedState = formatInputState(schema$1, proposedState);
 			const configState = formatInputState(schema$1, proposedState);
 			const plan = await client.call("PlanResourceChange", {
 				typeName: type,
@@ -2198,23 +2215,20 @@ const createPlugin6 = async ({ server, client }) => {
 			});
 			const plannedState = decodeDynamicValue(plan.plannedState);
 			return {
-				requiresReplace: formatAttributePath(plan.requiresReplace),
+				requiresReplace: filterRequiresReplace(formatAttributePath(plan.requiresReplace), preparedPriorState, preparedProposedState),
 				plannedState
 			};
 		},
-		async applyResourceChange(type, priorState, proposedState) {
+		async applyResourceChange(type, priorState, plannedState, configState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, {
-				...priorState,
-				...proposedState
-			});
-			const configState = formatInputState(schema$1, proposedState);
+			const preparedPlannedState = formatInputState(schema$1, plannedState);
+			const preparedConfigState = formatInputState(schema$1, configState);
 			return formatOutputState(schema$1, decodeDynamicValue((await client.call("ApplyResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
-				plannedState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(configState)
+				plannedState: encodeDynamicValue(preparedPlannedState),
+				config: encodeDynamicValue(preparedConfigState)
 			})).newState));
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@terraforge/terraform",
-	"version": "0.0.15",
+	"version": "0.0.18",
 	"type": "module",
 	"repository": {
 		"type": "git",