Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cli/azd/cmd/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,6 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
container.MustRegisterSingleton(containerregistry.NewRemoteBuildManager)
container.MustRegisterSingleton(keyvault.NewKeyVaultService)
container.MustRegisterSingleton(storage.NewFileShareService)
container.MustRegisterSingleton(azapi.NewSpringService)

container.MustRegisterScoped(project.NewContainerHelper)
container.MustRegisterScoped(func(serviceLocator ioc.ServiceLocator) *lazy.Lazy[*project.ContainerHelper] {
Expand Down
1 change: 0 additions & 1 deletion cli/azd/docs/feature-stages.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,4 @@ As of `1.21.1`, each Azure Developer CLI feature has been evaluated and assigned
| Host | Azure Container Apps | Stable |
| Host | Azure Functions | Stable |
| Host | Azure Kubernetes Service | Beta |
| Host | Azure Spring Apps | Beta |
| Host | Azure AI | Beta |
3 changes: 0 additions & 3 deletions cli/azd/pkg/azapi/azure_resource_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const (
AzureResourceTypeEventHubsNamespace AzureResourceType = "Microsoft.EventHub/namespaces"
AzureResourceTypeContainerApp AzureResourceType = "Microsoft.App/containerApps"
AzureResourceTypeContainerAppJob AzureResourceType = "Microsoft.App/jobs"
AzureResourceTypeSpringApp AzureResourceType = "Microsoft.AppPlatform/Spring"
AzureResourceTypeContainerAppEnvironment AzureResourceType = "Microsoft.App/managedEnvironments"
AzureResourceTypeDeployment AzureResourceType = "Microsoft.Resources/deployments"
AzureResourceTypeKeyVault AzureResourceType = "Microsoft.KeyVault/vaults"
Expand Down Expand Up @@ -127,8 +126,6 @@ func GetResourceTypeDisplayName(resourceType AzureResourceType) string {
return "Search service"
case AzureResourceTypeVideoIndexer:
return "Video Indexer"
case AzureResourceTypeSpringApp:
return "Azure Spring Apps"
case AzureResourceTypePrivateEndpoint:
return "Private Endpoint"
case AzureResourceTypeDevCenter:
Expand Down
295 changes: 0 additions & 295 deletions cli/azd/pkg/azapi/spring_app.go

This file was deleted.

9 changes: 0 additions & 9 deletions cli/azd/pkg/azure/resource_ids.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,6 @@ func ContainerAppRID(subscriptionId, resourceGroupName, containerAppName string)
return returnValue
}

func SpringAppRID(subscriptionId, resourceGroupName, springAppName string) string {
returnValue := fmt.Sprintf(
"%s/providers/Microsoft.AppPlatform/Spring/%s",
ResourceGroupRID(subscriptionId, resourceGroupName),
springAppName,
)
return returnValue
}

func KubernetesServiceRID(subscriptionId, resourceGroupName, clusterName string) string {
return fmt.Sprintf(
"%s/providers/Microsoft.ContainerService/managedClusters/%s",
Expand Down
2 changes: 0 additions & 2 deletions cli/azd/pkg/project/service_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ type ServiceConfig struct {
Docker DockerProjectOptions `yaml:"docker,omitempty"`
// The optional K8S / AKS options
K8s AksOptions `yaml:"k8s,omitempty"`
// The optional Azure Spring Apps options
Spring SpringOptions `yaml:"spring,omitempty"`
// Infrastructure module path relative to the root infra folder
Module string `yaml:"module,omitempty"`
// The infrastructure provisioning configuration
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/project/service_target.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ const (

// DotNetContainerAppTarget is intentionally omitted because it is only used internally when
// containerizing .NET projects and is not a valid service host value in azure.yaml.
// SpringAppTarget is intentionally omitted because support has been removed.
var builtInServiceTargetKinds = []ServiceTargetKind{
AppServiceTarget,
ContainerAppTarget,
AzureFunctionTarget,
StaticWebAppTarget,
SpringAppTarget,
AksTarget,
AiEndpointTarget,
}
Expand Down
Loading
Loading