Skip to content

Commit

Permalink
chore: added sdk from repo, some renaming changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rmocanu-ionos committed Nov 19, 2024
1 parent f98abc7 commit ce3b8ac
Show file tree
Hide file tree
Showing 52 changed files with 1,910 additions and 1,727 deletions.
1 change: 0 additions & 1 deletion docs/resources/s3_accesskey.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ The following arguments are supported:
- `timeouts` - (Optional) Timeouts for this resource.
- `create` - (Optional)[string] Time to wait for the bucket to be created. Default is `10m`.
- `delete` - (Optional)[string] Time to wait for the bucket to be deleted. Default is `10m`.
- `force_destroy` - (Optional)[bool] If true, the bucket and the contents of the bucket will be destroyed. Default is `false`.

## Import

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ require (
gopkg.in/yaml.v3 v3.0.1
)

replace github.com/ionos-cloud/sdk-go-s3-management v1.0.0 => /home/radu/work/rubygeneration/sdk-go-s3-management
replace github.com/ionos-cloud/sdk-go-s3-management v1.0.0 => /home/radu/work/sdk-go-s3-management

require (
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (r *accesskeyResource) Create(ctx context.Context, req resource.CreateReque
defer cancel()

var accessKey = s3management.AccessKeyCreate{
Properties: &s3management.AccessKeyProperties{
Properties: &s3management.AccessKey{
Description: data.Description.ValueStringPointer(),
},
}
Expand Down Expand Up @@ -182,7 +182,7 @@ func (r *accesskeyResource) Update(ctx context.Context, req resource.UpdateReque
defer cancel()

var accessKey = s3management.AccessKeyEnsure{
Properties: &s3management.AccessKeyProperties{
Properties: &s3management.AccessKey{
Description: plan.Description.ValueStringPointer(),
},
}
Expand Down
12 changes: 6 additions & 6 deletions services/s3management/accesskeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ type AccessKeyDataSourceModel struct {
}

// GetAccessKey retrieves an accesskey
func (c *Client) GetAccessKey(ctx context.Context, accessKeyID string) (s3management.AccessKey, *s3management.APIResponse, error) {
func (c *Client) GetAccessKey(ctx context.Context, accessKeyID string) (s3management.AccessKeyRead, *s3management.APIResponse, error) {
accessKey, apiResponse, err := c.client.AccesskeysApi.AccesskeysFindById(ctx, accessKeyID).Execute()
apiResponse.LogInfo()
return accessKey, apiResponse, err
}

// ListAccessKeys retrieves all accesskeys
func (c *Client) ListAccessKeys(ctx context.Context) (s3management.AccessKeyList, *s3management.APIResponse, error) {
func (c *Client) ListAccessKeys(ctx context.Context) (s3management.AccessKeyReadList, *s3management.APIResponse, error) {
accessKeys, apiResponse, err := c.client.AccesskeysApi.AccesskeysGet(ctx).Execute()
apiResponse.LogInfo()
return accessKeys, apiResponse, err
}

// CreateAccessKey creates an accesskey
func (c *Client) CreateAccessKey(ctx context.Context, accessKey s3management.AccessKeyCreate, timeout time.Duration) (s3management.AccessKey, *s3management.APIResponse, error) {
func (c *Client) CreateAccessKey(ctx context.Context, accessKey s3management.AccessKeyCreate, timeout time.Duration) (s3management.AccessKeyRead, *s3management.APIResponse, error) {
accessKeyResponse, apiResponse, err := c.client.AccesskeysApi.AccesskeysPost(ctx).AccessKeyCreate(accessKey).Execute()
apiResponse.LogInfo()

Expand All @@ -66,7 +66,7 @@ func (c *Client) CreateAccessKey(ctx context.Context, accessKey s3management.Acc
}

// UpdateAccessKey updates an accesskey
func (c *Client) UpdateAccessKey(ctx context.Context, accessKeyID string, accessKey s3management.AccessKeyEnsure, timeout time.Duration) (s3management.AccessKey, *s3management.APIResponse, error) {
func (c *Client) UpdateAccessKey(ctx context.Context, accessKeyID string, accessKey s3management.AccessKeyEnsure, timeout time.Duration) (s3management.AccessKeyRead, *s3management.APIResponse, error) {
accessKeyResponse, apiResponse, err := c.client.AccesskeysApi.AccesskeysPut(ctx, accessKeyID).AccessKeyEnsure(accessKey).Execute()
apiResponse.LogInfo()

Expand Down Expand Up @@ -104,7 +104,7 @@ func (c *Client) DeleteAccessKey(ctx context.Context, accessKeyID string, timeou
}

// SetAccessKeyPropertiesToPlan sets accesskey properties from an SDK object to a AccesskeyResourceModel
func SetAccessKeyPropertiesToPlan(plan *AccesskeyResourceModel, accessKey s3management.AccessKey) {
func SetAccessKeyPropertiesToPlan(plan *AccesskeyResourceModel, accessKey s3management.AccessKeyRead) {

if accessKey.Properties != nil {
// Here we check the properties because based on the request not all are set and we do not want to overwrite with nil
Expand All @@ -130,7 +130,7 @@ func SetAccessKeyPropertiesToPlan(plan *AccesskeyResourceModel, accessKey s3mana
}

// SetAccessKeyPropertiesToDataSourcePlan sets accesskey properties from an SDK object to a AccessKeyDataSourceModel
func SetAccessKeyPropertiesToDataSourcePlan(plan *AccessKeyDataSourceModel, accessKey s3management.AccessKey) {
func SetAccessKeyPropertiesToDataSourcePlan(plan *AccessKeyDataSourceModel, accessKey s3management.AccessKeyRead) {

if accessKey.Properties != nil {
// Here we check the properties because based on the request not all are set and we do not want to overwrite with nil
Expand Down
14 changes: 7 additions & 7 deletions services/s3management/regions.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ type capability struct {
}

// GetRegion retrieves a region
func (c *Client) GetRegion(ctx context.Context, regionID string, depth float32) (s3management.Region, *s3management.APIResponse, error) {
func (c *Client) GetRegion(ctx context.Context, regionID string, depth float32) (s3management.RegionRead, *s3management.APIResponse, error) {
region, apiResponse, err := c.client.RegionsApi.RegionsFindByRegion(ctx, regionID).Execute()
apiResponse.LogInfo()
return region, apiResponse, err
}

// ListRegions lists all regions
func (c *Client) ListRegions(ctx context.Context) (s3management.RegionList, *s3management.APIResponse, error) {
func (c *Client) ListRegions(ctx context.Context) (s3management.RegionReadList, *s3management.APIResponse, error) {
regions, apiResponse, err := c.client.RegionsApi.RegionsGet(ctx).Execute()
apiResponse.LogInfo()
return regions, apiResponse, err
}

// BuildRegionModelFromAPIResponse builds an RegionDataSourceModel from a region SDK object
func BuildRegionModelFromAPIResponse(output *s3management.Region) *RegionDataSourceModel {
func BuildRegionModelFromAPIResponse(output *s3management.RegionRead) *RegionDataSourceModel {
built := &RegionDataSourceModel{}

if output.Id != nil {
Expand All @@ -62,10 +62,10 @@ func BuildRegionModelFromAPIResponse(output *s3management.Region) *RegionDataSou
}
}

if output.Properties.Storageclasses != nil {
built.Storageclasses = make([]types.String, 0, len(*output.Properties.Storageclasses))
for i := range *output.Properties.Storageclasses {
built.Storageclasses = append(built.Storageclasses, types.StringPointerValue(&(*output.Properties.Storageclasses)[i]))
if output.Properties.StorageClasses != nil {
built.Storageclasses = make([]types.String, 0, len(*output.Properties.StorageClasses))
for i := range *output.Properties.StorageClasses {
built.Storageclasses = append(built.Storageclasses, types.StringPointerValue(&(*output.Properties.StorageClasses)[i]))
}
}
}
Expand Down
201 changes: 201 additions & 0 deletions vendor/github.com/ionos-cloud/sdk-go-s3-management/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ce3b8ac

Please sign in to comment.