Merge pull request #157 from Azure/revert-156-AttestationEndPoint

Revert "add attestation endpoint and token audience required for authenticating with Azure Attestation tenants"

Author: wyunchi-ms

src/Authentication.Abstractions/AzureEnvironment.cs

@@ -49,9 +49,7 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
                 GraphEndpointResourceId = AzureEnvironmentConstants.AzureGraphEndpoint,
                 DataLakeEndpointResourceId = AzureEnvironmentConstants.AzureDataLakeServiceEndpointResourceId,
                 BatchEndpointResourceId = AzureEnvironmentConstants.BatchEndpointResourceId,
-                AdTenant = "Common",
-                AzureAttestationDnsSuffix = AzureEnvironmentConstants.AzureAttestationDnsSuffix,
-                AzureAttestationServiceEndpointResourceId = AzureEnvironmentConstants.AzureAttestationServiceEndpointResourceId
+                AdTenant = "Common"
             };
             azureCloud.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, AzureEnvironmentConstants.AzureOperationalInsightsEndpoint);
             azureCloud.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, AzureEnvironmentConstants.AzureOperationalInsightsEndpointResourceId);
@@ -278,16 +276,6 @@ public AzureEnvironment(IAzureEnvironment other)
         /// </summary>
         public IDictionary<string, string> ExtendedProperties { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
-        /// <summary>
-        /// The domain name suffix for Azure Attestation tensnts created in this environment
-        /// </summary>
-        public string AzureAttestationDnsSuffix { get; set; }
-
-        /// <summary>
-        /// The token audience required for communicating with the Azure Attestation service in this environment
-        /// </summary>
-        public string AzureAttestationServiceEndpointResourceId { get; set; }
-
         /// <summary>
         /// A set of string constants for each of the known environment values - allows users to specify a particular kind of endpoint by name
         /// </summary>
@@ -311,9 +299,7 @@ public static class Endpoint
                 AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix",
                 AzureDataLakeStoreFileSystemEndpointSuffix = "AzureDataLakeStoreFileSystemEndpointSuffix",
                 DataLakeEndpointResourceId = "DataLakeEndpointResourceId",
-                BatchEndpointResourceId = "BatchEndpointResourceId",
-                AzureAttestationServiceEndpointResourceId = "AzureAttestationServiceEndpointResourceId",
-                AzureAttestationDnsSuffix = "AzureAttestationDnsSuffix";
+                BatchEndpointResourceId = "BatchEndpointResourceId";
         }
 
         public static class ExtendedEndpoint

src/Authentication.Abstractions/AzureEnvironmentConstants.cs

@@ -171,15 +171,5 @@ public static class AzureEnvironmentConstants
         public const string ChinaAnalysisServicesEndpointResourceId = "https://region.asazure.chinacloudapi.cn";
         public const string USGovernmentAnalysisServicesEndpointResourceId = "https://region.asazure.usgovcloudapi.net";
         public const string GermanAnalysisServicesEndpointResourceId = "https://region.asazure.cloudapi.de";
-
-        /// <summary>
-        /// The domain name suffix for azure attestation tennats
-        /// </summary>
-        public const string AzureAttestationDnsSuffix = "attest.azure.net ";
-
-        /// <summary>
-        /// The token audience for authorizing Attestation requests
-        /// </summary>
-        public const string AzureAttestationServiceEndpointResourceId = "https://attest.azure.net";
     }
 }

src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

@@ -151,12 +151,6 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
                     case AzureEnvironment.Endpoint.BatchEndpointResourceId:
                         propertyValue = environment.BatchEndpointResourceId;
                         break;
-                    case AzureEnvironment.Endpoint.AzureAttestationDnsSuffix:
-                        propertyValue = environment.AzureAttestationDnsSuffix;
-                        break;
-                    case AzureEnvironment.Endpoint.AzureAttestationServiceEndpointResourceId:
-                        propertyValue = environment.AzureAttestationServiceEndpointResourceId;
-                        break;
                     default:
                         // get property from the extended properties of the environment
                         propertyValue = environment.GetProperty(endpointName);
@@ -283,12 +277,6 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
                     case AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId:
                         environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId, propertyValue);
                         break;
-                    case AzureEnvironment.Endpoint.AzureAttestationDnsSuffix:
-                        environment.AzureAttestationDnsSuffix = propertyValue;
-                        break;
-                    case AzureEnvironment.Endpoint.AzureAttestationServiceEndpointResourceId:
-                        environment.AzureAttestationServiceEndpointResourceId = propertyValue;
-                        break;
                 }
             }
         }
@@ -324,10 +312,6 @@ public static string GetTokenAudience(this IAzureEnvironment environment, string
                 case AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId:
                     resource = AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId;
                     break;
-                case AzureEnvironment.Endpoint.AzureAttestationDnsSuffix:
-                case AzureEnvironment.Endpoint.AzureAttestationServiceEndpointResourceId:
-                    resource = AzureEnvironment.Endpoint.AzureAttestationServiceEndpointResourceId;
-                    break;
                 default:
                     resource = AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId;
                     break;
@@ -510,15 +494,6 @@ public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironmen
                 {
                     environment.BatchEndpointResourceId = other.BatchEndpointResourceId;
                 }
-                if (other.IsEndpointSet(AzureEnvironment.Endpoint.AzureAttestationDnsSuffix))
-                {
-                    environment.AzureAttestationDnsSuffix = other.AzureAttestationDnsSuffix;
-                }
-                if (other.IsEndpointSet(AzureEnvironment.Endpoint.AzureAttestationServiceEndpointResourceId))
-                {
-                    environment.AzureAttestationServiceEndpointResourceId =
-                        other.AzureAttestationServiceEndpointResourceId;
-                }
 
                 environment.VersionProfiles.Clear();
                 foreach (var profile in other.VersionProfiles)
@@ -610,15 +585,6 @@ public static void Update(this IAzureEnvironment environment, IAzureEnvironment
                 {
                     environment.DataLakeEndpointResourceId = other.DataLakeEndpointResourceId;
                 }
-                if (other.IsEndpointSet(AzureEnvironment.Endpoint.AzureAttestationDnsSuffix))
-                {
-                    environment.AzureAttestationDnsSuffix = other.AzureAttestationDnsSuffix;
-                }
-                if (other.IsEndpointSet(AzureEnvironment.Endpoint.AzureAttestationServiceEndpointResourceId))
-                {
-                    environment.AzureAttestationServiceEndpointResourceId =
-                        other.AzureAttestationServiceEndpointResourceId;
-                }
 
                 foreach (var profile in other.VersionProfiles)
                 {

src/Authentication.Abstractions/Interfaces/IAzureEnvironment.cs

@@ -131,15 +131,5 @@ public interface IAzureEnvironment : IExtensibleModel
         /// The set of version profile s(service capabilities) supported
         /// </summary>
         IList<string> VersionProfiles { get; }
-
-        /// <summary>
-        /// The domain name suffix for Azure Attestation tenants
-        /// </summary>
-        string AzureAttestationDnsSuffix { get; set; }
-
-        /// <summary>
-        /// The token audience required for authenticating with Azure Attestation tenants
-        /// </summary>
-        string AzureAttestationServiceEndpointResourceId { get; set; }
     }
 }