Resolve merge conflicts for pod and cluster resources (PR #217) #220
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit adds support for managing CloudStack Pods and Clusters through Terraform. It implements the following new resources and data sources: Resources: - cloudstack_pod: Allows creation and management of CloudStack Pods - cloudstack_cluster: Allows creation and management of CloudStack Clusters Data Sources: - cloudstack_cluster: Provides lookup capabilities for existing Clusters Implementation details: - Added resource_cloudstack_pod.go with CRUD operations for Pods - Added resource_cloudstack_cluster.go with CRUD operations for Clusters - Added data_source_cloudstack_cluster.go for Cluster data source - Created corresponding test files for all resources and data sources - Added documentation for all new resources and data sources - Updated provider.go to register the new resources and data sources - Added import functionality to both resources
- Merged PR apache#217 implementation with main branch - Used PR branch implementation for cluster and pod resources as it has better error handling and validation - Resolved conflicts in provider.go, resource files, test files, and documentation - All tests compile successfully
|
Thanks @sidshas03, could you please check the test failures and rectify them |
- Updated dependencies to ensure compatibility - All tests pass locally - Ready for CI validation
|
Hi @kiranchavala, |
@sidshas03 , github still reports conflicts. sorry. |
|
@sidshas03 can i close this pr as the #217 was closed and a new pr #222 was created |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR resolves the merge conflicts in the original PR #217 that added
cloudstack_podandcloudstack_clusterresources to the CloudStack Terraform provider.Changes Made
cloudstack/provider.gocloudstack/resource_cloudstack_cluster.gocloudstack/resource_cloudstack_pod.go*_test.go)Resources Added
cloudstack_pod- Create and manage CloudStack Podscloudstack_cluster- Create and manage CloudStack ClustersTesting
Related
cloudstack_pod&cloudstack_clusterresource #217