Merge master into feature/cwltail

packages/core/src/auth/auth.ts

@@ -16,7 +16,7 @@ import { Timeout } from '../shared/utilities/timeoutUtils'
 import { errorCode, isAwsError, isNetworkError, ToolkitError, UnknownError } from '../shared/errors'
 import { getCache, getCacheFileWatcher } from './sso/cache'
 import { isNonNullable, Mutable } from '../shared/utilities/tsUtils'
-import { builderIdStartUrl, SsoToken, truncateStartUrl } from './sso/model'
+import { SsoToken, truncateStartUrl } from './sso/model'
 import { SsoClient } from './sso/clients'
 import { getLogger } from '../shared/logger'
 import { CredentialsProviderManager } from './providers/credentialsProviderManager'
@@ -68,6 +68,7 @@ import { asStringifiedStack } from '../shared/telemetry/spans'
 import { withTelemetryContext } from '../shared/telemetry/util'
 import { DiskCacheError } from '../shared/utilities/cacheUtils'
 import { setContext } from '../shared/vscode/setContext'
+import { builderIdStartUrl, internalStartUrl } from './sso/constants'
 
 interface AuthService {
     /**
@@ -189,7 +190,7 @@ export class Auth implements AuthService, ConnectionManager {
     }
 
     public isInternalAmazonUser(): boolean {
-        return this.isConnected() && this.startUrl === 'https://amzn.awsapps.com/start'
+        return this.isConnected() && this.startUrl === internalStartUrl
     }
 
     /**

packages/core/src/auth/connection.ts

@@ -5,7 +5,7 @@
 import * as vscode from 'vscode'
 import { Credentials } from '@aws-sdk/types'
 import { Mutable } from '../shared/utilities/tsUtils'
-import { builderIdStartUrl, ClientRegistration, SsoToken, truncateStartUrl } from './sso/model'
+import { ClientRegistration, SsoToken, truncateStartUrl } from './sso/model'
 import { SsoClient } from './sso/clients'
 import { CredentialsProviderManager } from './providers/credentialsProviderManager'
 import { fromString } from './providers/credentials'
@@ -17,6 +17,7 @@ import { withTelemetryContext } from '../shared/telemetry/util'
 import { AuthModifyConnection, telemetry } from '../shared/telemetry/telemetry'
 import { asStringifiedStack } from '../shared/telemetry/spans'
 import { getTelemetryReason, getTelemetryReasonDesc } from '../shared/errors'
+import { builderIdStartUrl } from './sso/constants'
 
 /** Shows a warning message unless it is the same as the last one shown. */
 const warnOnce = onceChanged((s: string, url: string) => {

packages/core/src/auth/providers/sharedCredentialsProvider.ts

@@ -29,9 +29,9 @@ import {
     Profile,
     Section,
 } from '../credentials/sharedCredentials'
-import { builderIdStartUrl } from '../sso/model'
 import { SectionName, SharedCredentialsKeys } from '../credentials/types'
 import { SsoProfile, hasScopes, scopesSsoAccountAccess } from '../connection'
+import { builderIdStartUrl } from '../sso/constants'
 
 const credentialSources = {
     ECS_CONTAINER: 'EcsContainer',

packages/core/src/auth/sso/constants.ts

@@ -8,6 +8,9 @@
  * web, node, or vue.
  */
 
+export const builderIdStartUrl = 'https://view.awsapps.com/start'
+export const internalStartUrl = 'https://amzn.awsapps.com/start'
+
 export const ssoUrlFormatRegex =
     /^(https?:\/\/(.+)\.awsapps\.com\/start|https?:\/\/identitycenter\.amazonaws\.com\/ssoins-[\da-zA-Z]{16})\/?$/
 

packages/core/src/auth/sso/model.ts

@@ -16,6 +16,7 @@ import { ssoAuthHelpUrl } from '../../shared/constants'
 import { openUrl } from '../../shared/utilities/vsCodeUtils'
 import { ToolkitError } from '../../shared/errors'
 import { isCloud9 } from '../../shared/extensionUtilities'
+import { builderIdStartUrl } from './constants'
 
 export interface SsoToken {
     /**
@@ -88,7 +89,6 @@ export interface SsoProfile {
     readonly identifier?: string
 }
 
-export const builderIdStartUrl = 'https://view.awsapps.com/start'
 export const trustedDomainCancellation = 'TrustedDomainCancellation'
 
 const tryOpenHelpUrl = (url: vscode.Uri) =>

packages/core/src/auth/sso/ssoAccessTokenProvider.ts

@@ -6,15 +6,7 @@
 import * as vscode from 'vscode'
 import globals from '../../shared/extensionGlobals'
 import { AuthorizationPendingException, SSOOIDCServiceException, SlowDownException } from '@aws-sdk/client-sso-oidc'
-import {
-    SsoToken,
-    ClientRegistration,
-    isExpired,
-    SsoProfile,
-    builderIdStartUrl,
-    openSsoPortalLink,
-    isDeprecatedAuth,
-} from './model'
+import { SsoToken, ClientRegistration, isExpired, SsoProfile, openSsoPortalLink, isDeprecatedAuth } from './model'
 import { getCache } from './cache'
 import { hasProps, hasStringProps, RequiredProps, selectFrom } from '../../shared/utilities/tsUtils'
 import { OidcClient } from './clients'
@@ -46,6 +38,7 @@ import { NestedMap } from '../../shared/utilities/map'
 import { asStringifiedStack } from '../../shared/telemetry/spans'
 import { showViewLogsMessage } from '../../shared/utilities/messages'
 import _ from 'lodash'
+import { builderIdStartUrl } from './constants'
 
 export const authenticationPath = 'sso/authenticated'
 

packages/core/src/awsService/cloudWatchLogs/commands/viewLogStream.ts

@@ -24,8 +24,8 @@ import {
 import { prepareDocument, searchLogGroup } from './searchLogGroup'
 import { telemetry, Result } from '../../../shared/telemetry/telemetry'
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
-import { formatLocalized } from '../../../shared/utilities/textUtilities'
 import { cwlUriSchema } from '../cloudWatchLogsUtils'
+import { formatLocalized } from '../../../shared/datetime'
 
 export async function viewLogStream(node: LogGroupNode, registry: LogDataRegistry): Promise<void> {
     await telemetry.cloudwatchlogs_open.run(async (span) => {

packages/core/src/awsService/cloudWatchLogs/document/textContent.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { formatDateTimestamp } from '../../../shared/datetime'
 import { CloudWatchLogsEvent, CloudWatchLogsGroupInfo } from '../registry/logDataRegistry'
-import { formatDateTimestamp } from '../../../shared/utilities/textUtilities'
 
 export const timestampSpaceEquivalent = '                             '
 

packages/core/src/awsService/ecs/commands.ts

@@ -11,7 +11,7 @@ import globals from '../../shared/extensionGlobals'
 import { ToolkitPromptSettings } from '../../shared/settings'
 import { ChildProcess } from '../../shared/utilities/processUtils'
 import { showMessageWithCancel, showOutputMessage } from '../../shared/utilities/messages'
-import { formatDateTimestamp, removeAnsi } from '../../shared/utilities/textUtilities'
+import { removeAnsi } from '../../shared/utilities/textUtilities'
 import { CancellationError, Timeout } from '../../shared/utilities/timeoutUtils'
 import { Commands } from '../../shared/vscode/commands2'
 import { EcsSettings } from './util'
@@ -22,6 +22,7 @@ import { Container, Service } from './model'
 import { Instance } from '../../shared/utilities/typeConstructors'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { openRemoteTerminal } from '../../shared/remoteSession'
+import { formatDateTimestamp } from '../../shared/datetime'
 
 async function runCommandWizard(
     param?: unknown,

packages/core/src/awsService/iot/explorer/iotCertificateNode.ts

@@ -20,9 +20,10 @@ import { IotCertsFolderNode } from './iotCertFolderNode'
 import { IotThingNode } from './iotThingNode'
 import { IotPolicyCertNode } from './iotPolicyNode'
 import { getIcon } from '../../../shared/icons'
-import { formatLocalized, truncate } from '../../../shared/utilities/textUtilities'
+import { truncate } from '../../../shared/utilities/textUtilities'
 import { Settings } from '../../../shared/settings'
 import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+import { formatLocalized } from '../../../shared/datetime'
 
 const contextBase = 'awsIotCertificateNode'
 /**

packages/core/src/awsService/iot/explorer/iotPolicyVersionNode.ts

@@ -10,7 +10,7 @@ import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { inspect } from 'util'
 import { IotPolicyWithVersionsNode } from './iotPolicyNode'
 import { localize } from '../../../shared/utilities/vsCodeUtils'
-import { formatLocalized } from '../../../shared/utilities/textUtilities'
+import { formatLocalized } from '../../../shared/datetime'
 
 /**
  * Represents an IoT Policy that may have either a Certificate Node or the

packages/core/src/awsService/s3/explorer/s3FileNode.ts

@@ -12,9 +12,9 @@ import { inspect } from 'util'
 import { S3BucketNode } from './s3BucketNode'
 import { S3FolderNode } from './s3FolderNode'
 import globals from '../../../shared/extensionGlobals'
-import { formatLocalized, getRelativeDate } from '../../../shared/utilities/textUtilities'
 import { isCloud9 } from '../../../shared/extensionUtilities'
 import { getIcon } from '../../../shared/icons'
+import { formatLocalized, getRelativeDate } from '../../../shared/datetime'
 
 /**
  * Represents an object in an S3 bucket.

packages/core/src/codecatalyst/auth.ts

@@ -26,11 +26,11 @@ import {
     hasExactScopes,
 } from '../auth/connection'
 import { createBuilderIdConnection } from '../auth/utils'
-import { builderIdStartUrl } from '../auth/sso/model'
 import { showReauthenticateMessage } from '../shared/utilities/messages'
 import { ToolkitPromptSettings } from '../shared/settings'
 import { setContext } from '../shared/vscode/setContext'
 import { withTelemetryContext } from '../shared/telemetry/util'
+import { builderIdStartUrl } from '../auth/sso/constants'
 
 // Secrets stored on the macOS keychain appear as individual entries for each key
 // This is fine so long as the user has only a few accounts. Otherwise this should

packages/core/src/codecatalyst/uriHandlers.ts

@@ -7,9 +7,9 @@ import * as vscode from 'vscode'
 import { SearchParams, UriHandler } from '../shared/vscode/uriHandler'
 import { getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
 import { CodeCatalystCommands } from './commands'
-import { builderIdStartUrl } from '../auth/sso/model'
 import { defaultSsoRegion } from '../auth/connection'
 import { getLogger } from '../shared/logger'
+import { builderIdStartUrl } from '../auth/sso/constants'
 
 type ConnectParams = {
     devEnvironmentId: string

packages/core/src/codecatalyst/wizards/selectResource.ts

@@ -14,11 +14,11 @@ import {
     QuickPickPrompter,
 } from '../../shared/ui/pickerPrompter'
 import { AsyncCollection } from '../../shared/utilities/asyncCollection'
-import { getRelativeDate } from '../../shared/utilities/textUtilities'
 import { isValidResponse } from '../../shared/wizards/wizard'
 import { associateDevEnv, docs } from '../model'
 import { getHelpUrl, isDevenvVscode } from '../utils'
 import { getLogger } from '../../shared/logger/logger'
+import { getRelativeDate } from '../../shared/datetime'
 
 export function createRepoLabel(r: codecatalyst.CodeCatalystRepo): string {
     return `${r.org.name} / ${r.project.name} / ${r.name}`

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -21,7 +21,6 @@ import {
     DB,
     TransformationType,
 } from '../models/model'
-import { convertDateToTimestamp } from '../../shared/utilities/textUtilities'
 import {
     createZipManifest,
     downloadAndExtractResultArchive,
@@ -80,6 +79,7 @@ import { HumanInTheLoopManager } from '../service/transformByQ/humanInTheLoopMan
 import { setContext } from '../../shared/vscode/setContext'
 import { makeTemporaryToolkitFolder } from '../../shared'
 import globals from '../../shared/extensionGlobals'
+import { convertDateToTimestamp } from '../../shared/datetime'
 
 function getFeedbackCommentData() {
     const jobId = transformByQState.getJobId()

packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts

@@ -47,7 +47,8 @@ import { downloadExportResultArchive } from '../../../shared/utilities/download'
 import { ExportIntent, TransformationDownloadArtifactType } from '@amzn/codewhisperer-streaming'
 import fs from '../../../shared/fs/fs'
 import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
-import { convertToTimeString, encodeHTML } from '../../../shared/utilities/textUtilities'
+import { encodeHTML } from '../../../shared/utilities/textUtilities'
+import { convertToTimeString } from '../../../shared/datetime'
 
 export function getSha256(buffer: Buffer) {
     const hasher = crypto.createHash('sha256')

packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts

@@ -13,7 +13,6 @@ import {
     sessionJobHistory,
     transformByQState,
 } from '../../models/model'
-import { convertToTimeString } from '../../../shared/utilities/textUtilities'
 import { getLogger } from '../../../shared/logger'
 import { getTransformationSteps } from './transformApiHandler'
 import {
@@ -23,6 +22,7 @@ import {
 } from '../../../codewhisperer/client/codewhispereruserclient'
 import { startInterval } from '../../commands/startTransformByQ'
 import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
+import { convertToTimeString } from '../../../shared/datetime'
 
 export class TransformationHubViewProvider implements vscode.WebviewViewProvider {
     public static readonly viewType = 'aws.amazonq.transformationHub'

packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts

@@ -19,9 +19,9 @@ import { VSCODE_EXTENSION_ID } from '../../../../shared/extensions'
 import { getLogger } from '../../../../shared/logger'
 import { debounce } from 'lodash'
 import { AuthError, AuthFlowState, userCancelled } from '../types'
-import { builderIdStartUrl } from '../../../../auth/sso/model'
 import { ToolkitError } from '../../../../shared/errors'
 import { withTelemetryContext } from '../../../../shared/telemetry/util'
+import { builderIdStartUrl } from '../../../../auth/sso/constants'
 
 const className = 'AmazonQLoginWebview'
 export class AmazonQLoginWebview extends CommonAuthWebview {

packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts

@@ -19,8 +19,8 @@ import {
 import { Auth } from '../../../../auth/auth'
 import { CodeCatalystAuthenticationProvider } from '../../../../codecatalyst/auth'
 import { AuthError, AuthFlowState } from '../types'
-import { builderIdStartUrl } from '../../../../auth/sso/model'
 import { setContext } from '../../../../shared'
+import { builderIdStartUrl } from '../../../../auth/sso/constants'
 
 export class ToolkitLoginWebview extends CommonAuthWebview {
     public override id: string = 'aws.toolkit.AmazonCommonAuth'