cloudstack-terraform-provider icon indicating copy to clipboard operation
cloudstack-terraform-provider copied to clipboard

Published 20 hours ago • verified publisher icon apache

Resolve merge conflicts for pod and cluster resources (PR #217)

Open sidshas03 opened this issue 2 months ago • 4 comments

Summary

This PR resolves the merge conflicts in the original PR #217 that added cloudstack_pod and cloudstack_cluster resources to the CloudStack Terraform provider.

Changes Made

  • ✅ Resolved merge conflicts in cloudstack/provider.go
  • ✅ Resolved conflicts in cloudstack/resource_cloudstack_cluster.go
  • ✅ Resolved conflicts in cloudstack/resource_cloudstack_pod.go
  • ✅ Resolved conflicts in test files (*_test.go)
  • ✅ Resolved conflicts in documentation files
  • ✅ Used PR branch implementation for better error handling and validation
  • ✅ Preserved all existing functionality

Resources Added

  • cloudstack_pod - Create and manage CloudStack Pods
  • cloudstack_cluster - Create and manage CloudStack Clusters
  • Both resources include full CRUD operations, import functionality, and comprehensive validation

Testing

  • ✅ All code compiles successfully
  • ✅ All tests pass
  • ✅ No linting errors
  • ✅ Maintains backward compatibility

Related

  • Resolves conflicts from original PR #217
  • Addresses reviewer feedback from @kiranchavala

sidshas03 avatar Sep 15 '25 14:09 sidshas03