sidshas03 opened a new pull request, #220: URL: https://github.com/apache/cloudstack-terraform-provider/pull/220
## 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 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
