stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Update DSA dependencies (#5)

Browse source 
Co-authored-by: Henrique Santos <henrique.santos@freiheit.com>
This commit is contained in:
Henrique Santos 2023-09-07 16:09:14 +01:00 • committed by GitHub
parent d5906cb6b1
commit 6800f7a421
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 300 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

2
stackit/services/logme/instance/datasource.go
View file

@ -143,7 +143,7 @@ func (r *instanceDataSource) Schema(_ context.Context, _ datasource.SchemaReques
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},

30
stackit/services/logme/instance/resource.go
View file

@ -33,19 +33,19 @@ var (
)
type Model struct {
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
OrganizationGuid types.String `tfsdk:"organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
CfOrganizationGuid types.String `tfsdk:"cf_organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
}
// Struct corresponding to DataSourceModel.Parameters
@ -212,7 +212,7 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
stringplanmodifier.UseStateForUnknown(),
},
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
@ -455,7 +455,7 @@ func mapFields(instance *logme.Instance, model *Model) error {
model.DashboardUrl = types.StringPointerValue(instance.DashboardUrl)
model.ImageUrl = types.StringPointerValue(instance.ImageUrl)
model.Name = types.StringPointerValue(instance.Name)
model.OrganizationGuid = types.StringPointerValue(instance.OrganizationGuid)
model.CfOrganizationGuid = types.StringPointerValue(instance.CfOrganizationGuid)
if instance.Parameters == nil {
model.Parameters = types.ObjectNull(parametersTypes)

58
stackit/services/logme/instance/resource_test.go
View file

@ -21,46 +21,46 @@ func TestMapFields(t *testing.T) {
"default_values",
&logme.Instance{},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
OrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
CfOrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
},
true,
},
{
"simple_values",
&logme.Instance{
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
OrganizationGuid: utils.Ptr("org"),
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
CfOrganizationGuid: utils.Ptr("org"),
Parameters: &map[string]interface{}{
"sgw_acl": "acl",
},
},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
OrganizationGuid: types.StringValue("org"),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
CfOrganizationGuid: types.StringValue("org"),
Parameters: types.ObjectValueMust(parametersTypes, map[string]attr.Value{
"sgw_acl": types.StringValue("acl"),
}),

2
stackit/services/mariadb/instance/datasource.go
View file

@ -143,7 +143,7 @@ func (r *instanceDataSource) Schema(_ context.Context, _ datasource.SchemaReques
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},

30
stackit/services/mariadb/instance/resource.go
View file

@ -33,19 +33,19 @@ var (
)
type Model struct {
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
OrganizationGuid types.String `tfsdk:"organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
CfOrganizationGuid types.String `tfsdk:"cf_organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
}
// Struct corresponding to DataSourceModel.Parameters
@ -197,7 +197,7 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},
@ -436,7 +436,7 @@ func mapFields(instance *mariadb.Instance, model *Model) error {
model.DashboardUrl = types.StringPointerValue(instance.DashboardUrl)
model.ImageUrl = types.StringPointerValue(instance.ImageUrl)
model.Name = types.StringPointerValue(instance.Name)
model.OrganizationGuid = types.StringPointerValue(instance.OrganizationGuid)
model.CfOrganizationGuid = types.StringPointerValue(instance.CfOrganizationGuid)
if instance.Parameters == nil {
model.Parameters = types.ObjectNull(parametersTypes)

58
stackit/services/mariadb/instance/resource_test.go
View file

@ -21,46 +21,46 @@ func TestMapFields(t *testing.T) {
"default_values",
&mariadb.Instance{},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
OrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
CfOrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
},
true,
},
{
"simple_values",
&mariadb.Instance{
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
OrganizationGuid: utils.Ptr("org"),
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
CfOrganizationGuid: utils.Ptr("org"),
Parameters: &map[string]interface{}{
"sgw_acl": "acl",
},
},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
OrganizationGuid: types.StringValue("org"),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
CfOrganizationGuid: types.StringValue("org"),
Parameters: types.ObjectValueMust(parametersTypes, map[string]attr.Value{
"sgw_acl": types.StringValue("acl"),
}),

2
stackit/services/opensearch/instance/datasource.go
View file

@ -143,7 +143,7 @@ func (r *instanceDataSource) Schema(_ context.Context, _ datasource.SchemaReques
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},

30
stackit/services/opensearch/instance/resource.go
View file

@ -33,19 +33,19 @@ var (
)
type Model struct {
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
OrganizationGuid types.String `tfsdk:"organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
CfOrganizationGuid types.String `tfsdk:"cf_organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
}
// Struct corresponding to DataSourceModel.Parameters
@ -197,7 +197,7 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},
@ -436,7 +436,7 @@ func mapFields(instance *opensearch.Instance, model *Model) error {
model.DashboardUrl = types.StringPointerValue(instance.DashboardUrl)
model.ImageUrl = types.StringPointerValue(instance.ImageUrl)
model.Name = types.StringPointerValue(instance.Name)
model.OrganizationGuid = types.StringPointerValue(instance.OrganizationGuid)
model.CfOrganizationGuid = types.StringPointerValue(instance.CfOrganizationGuid)
if instance.Parameters == nil {
model.Parameters = types.ObjectNull(parametersTypes)
} else {

58
stackit/services/opensearch/instance/resource_test.go
View file

@ -21,46 +21,46 @@ func TestMapFields(t *testing.T) {
"default_values",
&opensearch.Instance{},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
OrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
CfOrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
},
true,
},
{
"simple_values",
&opensearch.Instance{
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
OrganizationGuid: utils.Ptr("org"),
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
CfOrganizationGuid: utils.Ptr("org"),
Parameters: &map[string]interface{}{
"sgw_acl": "acl",
},
},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
OrganizationGuid: types.StringValue("org"),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
CfOrganizationGuid: types.StringValue("org"),
Parameters: types.ObjectValueMust(parametersTypes, map[string]attr.Value{
"sgw_acl": types.StringValue("acl"),
}),

2
stackit/services/postgresql/instance/datasource.go
View file

@ -160,7 +160,7 @@ func (r *instanceDataSource) Schema(_ context.Context, _ datasource.SchemaReques
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},

30
stackit/services/postgresql/instance/resource.go
View file

@ -33,19 +33,19 @@ var (
)
type Model struct {
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
OrganizationGuid types.String `tfsdk:"organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
CfOrganizationGuid types.String `tfsdk:"cf_organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
}
// Struct corresponding to DataSourceModel.Parameters
@ -238,7 +238,7 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
stringplanmodifier.UseStateForUnknown(),
},
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
@ -555,7 +555,7 @@ func mapFields(instance *postgresql.Instance, model *Model) error {
model.DashboardUrl = types.StringPointerValue(instance.DashboardUrl)
model.ImageUrl = types.StringPointerValue(instance.ImageUrl)
model.Name = types.StringPointerValue(instance.Name)
model.OrganizationGuid = types.StringPointerValue(instance.OrganizationGuid)
model.CfOrganizationGuid = types.StringPointerValue(instance.CfOrganizationGuid)
if instance.Parameters == nil {
model.Parameters = types.ObjectNull(parametersTypes)

58
stackit/services/postgresql/instance/resource_test.go
View file

@ -21,31 +21,31 @@ func TestMapFields(t *testing.T) {
"default_values",
&postgresql.Instance{},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
OrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
CfOrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
},
true,
},
{
"simple_values",
&postgresql.Instance{
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
OrganizationGuid: utils.Ptr("org"),
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
CfOrganizationGuid: utils.Ptr("org"),
Parameters: &map[string]interface{}{
"enable_monitoring": true,
"metrics_frequency": 1234,
@ -57,16 +57,16 @@ func TestMapFields(t *testing.T) {
},
},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
OrganizationGuid: types.StringValue("org"),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
CfOrganizationGuid: types.StringValue("org"),
Parameters: types.ObjectValueMust(parametersTypes, map[string]attr.Value{
"enable_monitoring": types.BoolValue(true),
"metrics_frequency": types.Int64Value(1234),

2
stackit/services/rabbitmq/instance/datasource.go
View file

@ -143,7 +143,7 @@ func (r *instanceDataSource) Schema(_ context.Context, _ datasource.SchemaReques
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},

30
stackit/services/rabbitmq/instance/resource.go
View file

@ -34,19 +34,19 @@ var (
)
type Model struct {
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
OrganizationGuid types.String `tfsdk:"organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
CfOrganizationGuid types.String `tfsdk:"cf_organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
}
// Struct corresponding to DataSourceModel.Parameters
@ -210,7 +210,7 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},
@ -488,7 +488,7 @@ func mapFields(instance *rabbitmq.Instance, model *Model) error {
model.DashboardUrl = types.StringPointerValue(instance.DashboardUrl)
model.ImageUrl = types.StringPointerValue(instance.ImageUrl)
model.Name = types.StringPointerValue(instance.Name)
model.OrganizationGuid = types.StringPointerValue(instance.OrganizationGuid)
model.CfOrganizationGuid = types.StringPointerValue(instance.CfOrganizationGuid)
if instance.Parameters == nil {
model.Parameters = types.ObjectNull(parametersTypes)

58
stackit/services/rabbitmq/instance/resource_test.go
View file

@ -21,46 +21,46 @@ func TestMapFields(t *testing.T) {
"default_values",
&rabbitmq.Instance{},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
OrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
CfOrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
},
true,
},
{
"simple_values",
&rabbitmq.Instance{
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
OrganizationGuid: utils.Ptr("org"),
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
CfOrganizationGuid: utils.Ptr("org"),
Parameters: &map[string]interface{}{
"sgw_acl": "acl",
},
},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
OrganizationGuid: types.StringValue("org"),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
CfOrganizationGuid: types.StringValue("org"),
Parameters: types.ObjectValueMust(parametersTypes, map[string]attr.Value{
"sgw_acl": types.StringValue("acl"),
}),

2
stackit/services/redis/instance/datasource.go
View file

@ -143,7 +143,7 @@ func (r *instanceDataSource) Schema(_ context.Context, _ datasource.SchemaReques
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},

30
stackit/services/redis/instance/resource.go
View file

@ -34,19 +34,19 @@ var (
)
type Model struct {
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
OrganizationGuid types.String `tfsdk:"organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
Id types.String `tfsdk:"id"` // needed by TF
InstanceId types.String `tfsdk:"instance_id"`
ProjectId types.String `tfsdk:"project_id"`
CfGuid types.String `tfsdk:"cf_guid"`
CfSpaceGuid types.String `tfsdk:"cf_space_guid"`
DashboardUrl types.String `tfsdk:"dashboard_url"`
ImageUrl types.String `tfsdk:"image_url"`
Name types.String `tfsdk:"name"`
CfOrganizationGuid types.String `tfsdk:"cf_organization_guid"`
Parameters types.Object `tfsdk:"parameters"`
Version types.String `tfsdk:"version"`
PlanName types.String `tfsdk:"plan_name"`
PlanId types.String `tfsdk:"plan_id"`
}
// Struct corresponding to DataSourceModel.Parameters
@ -207,7 +207,7 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
"image_url": schema.StringAttribute{
Computed: true,
},
"organization_guid": schema.StringAttribute{
"cf_organization_guid": schema.StringAttribute{
Computed: true,
},
},
@ -485,7 +485,7 @@ func mapFields(instance *redis.Instance, model *Model) error {
model.DashboardUrl = types.StringPointerValue(instance.DashboardUrl)
model.ImageUrl = types.StringPointerValue(instance.ImageUrl)
model.Name = types.StringPointerValue(instance.Name)
model.OrganizationGuid = types.StringPointerValue(instance.OrganizationGuid)
model.CfOrganizationGuid = types.StringPointerValue(instance.CfOrganizationGuid)
if instance.Parameters == nil {
model.Parameters = types.ObjectNull(parametersTypes)

58
stackit/services/redis/instance/resource_test.go
View file

@ -21,46 +21,46 @@ func TestMapFields(t *testing.T) {
"default_values",
&redis.Instance{},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
OrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringNull(),
Name: types.StringNull(),
CfGuid: types.StringNull(),
CfSpaceGuid: types.StringNull(),
DashboardUrl: types.StringNull(),
ImageUrl: types.StringNull(),
CfOrganizationGuid: types.StringNull(),
Parameters: types.ObjectNull(parametersTypes),
},
true,
},
{
"simple_values",
&redis.Instance{
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
OrganizationGuid: utils.Ptr("org"),
PlanId: utils.Ptr("plan"),
CfGuid: utils.Ptr("cf"),
CfSpaceGuid: utils.Ptr("space"),
DashboardUrl: utils.Ptr("dashboard"),
ImageUrl: utils.Ptr("image"),
InstanceId: utils.Ptr("iid"),
Name: utils.Ptr("name"),
CfOrganizationGuid: utils.Ptr("org"),
Parameters: &map[string]interface{}{
"sgw_acl": "acl",
},
},
Model{
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
OrganizationGuid: types.StringValue("org"),
Id: types.StringValue("pid,iid"),
InstanceId: types.StringValue("iid"),
ProjectId: types.StringValue("pid"),
PlanId: types.StringValue("plan"),
Name: types.StringValue("name"),
CfGuid: types.StringValue("cf"),
CfSpaceGuid: types.StringValue("space"),
DashboardUrl: types.StringValue("dashboard"),
ImageUrl: types.StringValue("image"),
CfOrganizationGuid: types.StringValue("org"),
Parameters: types.ObjectValueMust(parametersTypes, map[string]attr.Value{
"sgw_acl": types.StringValue("acl"),
}),