feat: provider v0.1.9 — namespace removed from resources, moved to provider block
This commit is contained in:
@@ -35,7 +35,6 @@ func NewTriggerResource() resource.Resource {
|
||||
|
||||
// TriggerModel — модель состояния terraform для sless_trigger.
|
||||
type TriggerModel struct {
|
||||
Namespace types.String `tfsdk:"namespace"`
|
||||
Name types.String `tfsdk:"name"`
|
||||
Type types.String `tfsdk:"type"`
|
||||
FunctionRef types.String `tfsdk:"function"`
|
||||
@@ -54,12 +53,6 @@ func (r *TriggerResource) Metadata(_ context.Context, req resource.MetadataReque
|
||||
func (r *TriggerResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
|
||||
resp.Schema = schema.Schema{
|
||||
Attributes: map[string]schema.Attribute{
|
||||
"namespace": schema.StringAttribute{
|
||||
Required: true,
|
||||
PlanModifiers: []planmodifier.String{
|
||||
stringplanmodifier.RequiresReplace(),
|
||||
},
|
||||
},
|
||||
"name": schema.StringAttribute{
|
||||
Required: true,
|
||||
PlanModifiers: []planmodifier.String{
|
||||
@@ -136,7 +129,7 @@ func (r *TriggerResource) Create(ctx context.Context, req resource.CreateRequest
|
||||
return
|
||||
}
|
||||
|
||||
tr, err := r.client.CreateTrigger(ctx, plan.Namespace.ValueString(), client.TriggerRequest{
|
||||
tr, err := r.client.CreateTrigger(ctx, r.client.Namespace, client.TriggerRequest{
|
||||
Name: plan.Name.ValueString(),
|
||||
Type: plan.Type.ValueString(),
|
||||
FunctionRef: plan.FunctionRef.ValueString(),
|
||||
@@ -151,7 +144,7 @@ func (r *TriggerResource) Create(ctx context.Context, req resource.CreateRequest
|
||||
// Контроллер заполняет status.URL асинхронно — ждём до 30 секунд.
|
||||
// Без этого URL остаётся пустым в state и требует ручного terraform refresh.
|
||||
if tr.URL == "" && plan.Type.ValueString() == "http" {
|
||||
ns := plan.Namespace.ValueString()
|
||||
ns := r.client.Namespace
|
||||
name := plan.Name.ValueString()
|
||||
deadline := time.Now().Add(30 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
@@ -174,7 +167,7 @@ func (r *TriggerResource) Read(ctx context.Context, req resource.ReadRequest, re
|
||||
return
|
||||
}
|
||||
|
||||
tr, err := r.client.GetTrigger(ctx, state.Namespace.ValueString(), state.Name.ValueString())
|
||||
tr, err := r.client.GetTrigger(ctx, r.client.Namespace, state.Name.ValueString())
|
||||
if err != nil {
|
||||
resp.Diagnostics.AddError("read trigger", err.Error())
|
||||
return
|
||||
@@ -198,7 +191,7 @@ func (r *TriggerResource) Update(ctx context.Context, req resource.UpdateRequest
|
||||
}
|
||||
|
||||
enabled := plan.Enabled.ValueBool()
|
||||
tr, err := r.client.UpdateTrigger(ctx, plan.Namespace.ValueString(), plan.Name.ValueString(), client.TriggerUpdateRequest{
|
||||
tr, err := r.client.UpdateTrigger(ctx, r.client.Namespace, plan.Name.ValueString(), client.TriggerUpdateRequest{
|
||||
Enabled: &enabled,
|
||||
})
|
||||
if err != nil {
|
||||
@@ -216,7 +209,7 @@ func (r *TriggerResource) Delete(ctx context.Context, req resource.DeleteRequest
|
||||
return
|
||||
}
|
||||
|
||||
if err := r.client.DeleteTrigger(ctx, state.Namespace.ValueString(), state.Name.ValueString()); err != nil {
|
||||
if err := r.client.DeleteTrigger(ctx, r.client.Namespace, state.Name.ValueString()); err != nil {
|
||||
resp.Diagnostics.AddError("delete trigger", err.Error())
|
||||
}
|
||||
}
|
||||
@@ -230,7 +223,6 @@ func trToModel(tr *client.TriggerResponse) TriggerModel {
|
||||
schedule = types.StringValue(tr.Schedule)
|
||||
}
|
||||
return TriggerModel{
|
||||
Namespace: types.StringValue(tr.Namespace),
|
||||
Name: types.StringValue(tr.Name),
|
||||
Type: types.StringValue(tr.Type),
|
||||
FunctionRef: types.StringValue(tr.FunctionRef),
|
||||
|
||||
Reference in New Issue
Block a user