Skip to content

Commit

Permalink
Use dedicated Azure schema for azure feed resource
Browse files Browse the repository at this point in the history
  • Loading branch information
denys-octopus committed Nov 13, 2024
1 parent 32c8e91 commit 5c0a906
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions octopusdeploy_framework/resource_azure_container_registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (r *azureContainerRegistryFeedTypeResource) Metadata(ctx context.Context, r
}

func (r *azureContainerRegistryFeedTypeResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
resp.Schema = schemas.GoogleContainerRegistryFeedSchema{}.GetResourceSchema()
resp.Schema = schemas.AzureContainerRegistryFeedSchema{}.GetResourceSchema()
}

func (r *azureContainerRegistryFeedTypeResource) Configure(_ context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
Expand Down Expand Up @@ -117,7 +117,7 @@ func (r *azureContainerRegistryFeedTypeResource) Update(ctx context.Context, req

updateAzureDataFromDockerContainerRegistryFeed(data, state.SpaceID.ValueString(), updatedFeed.(*feeds.DockerContainerRegistry))

tflog.Info(ctx, fmt.Sprintf("Google Container Registry feed updated (%s)", data.ID))
tflog.Info(ctx, fmt.Sprintf("Azure Container Registry feed updated (%s)", data.ID))

resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func updateDataFromListeningTentacleWorker(ctx context.Context, data *schemas.Li
data.Name = types.StringValue(worker.Name)
data.IsDisabled = types.BoolValue(worker.IsDisabled)
data.MachinePolicyID = types.StringValue(worker.MachinePolicyID)
data.WorkerPoolIDs, _ = types.ListValueFrom(ctx, types.StringType, worker.WorkerPoolIDs)
data.WorkerPoolIDs, _ = types.SetValueFrom(ctx, types.StringType, worker.WorkerPoolIDs)

endpoint := worker.Endpoint.(*machines.ListeningTentacleEndpoint)
data.Uri = types.StringValue(endpoint.URI.String())
Expand Down

0 comments on commit 5c0a906

Please sign in to comment.