From 6ad673577bd8d92bb0d763dc24c80f9c0cfcabd0 Mon Sep 17 00:00:00 2001 From: "Pohsiang (John) Hsu" Date: Tue, 24 Oct 2023 13:44:55 -0700 Subject: [PATCH] move PlaybackService up one level --- .github/workflows/ci-build.yml | 8 ++++---- .../.github/ISSUE_TEMPLATE/JitAccess.yml | 0 .../.github/acl/access.yml | 0 .../.github/compliance/inventory.yml | 0 .../.github/policies/branch-protection.yml | 0 .../.github/policies/jit.yml | 0 .../.github/workflows/ci.yaml | 0 .../PlaybackService => PlaybackService}/.gitignore | 0 .../PlaybackService.sln | 0 .../PlaybackService => PlaybackService}/README.md | 0 .../deployment/playbackservice.yaml | 0 .../src/AzureServiceFactory.cs | 0 .../src/Caches/KeyCache.cs | 0 .../src/Controllers/KeyDeliverController.cs | 0 .../src/Controllers/PlaybackController.cs | 0 .../src/Dockerfile | 0 .../src/IBlobClientFactory.cs | 0 .../ContentTypeInjectionForShakaPlayer.cs | 0 .../src/Middlewares/CustomAuthenticationHandler.cs | 0 .../CustomAuthenticationHandlerOptions.cs | 0 .../src/Middlewares/GlobalExceptionHandler.cs | 0 .../src/PlaybackService.csproj | 0 .../src/Program.cs | 0 .../src/appsettings.Development.json | 0 .../src/appsettings.json | 0 .../src/wwwroot/favicon.ico | Bin .../src/wwwroot/index.html | 0 .../src/wwwroot/index.js | 0 .../src/wwwroot/shaka-player.compiled.js | 0 .../test/KeyDeliverControllerTest.cs | 0 .../test/PlaybackControllerTest.cs | 0 .../test/PlaybackService.Test.csproj | 0 .../test/TestBase.cs | 0 .../test/test-data/dash.ingested.mpd | 0 .../test/test-data/dash.mpd | 0 .../test/test-data/hls.ingested.m3u8 | 0 .../test/test-data/hls.m3u8 | 0 37 files changed, 4 insertions(+), 4 deletions(-) rename {tools/PlaybackService => PlaybackService}/.github/ISSUE_TEMPLATE/JitAccess.yml (100%) rename {tools/PlaybackService => PlaybackService}/.github/acl/access.yml (100%) rename {tools/PlaybackService => PlaybackService}/.github/compliance/inventory.yml (100%) rename {tools/PlaybackService => PlaybackService}/.github/policies/branch-protection.yml (100%) rename {tools/PlaybackService => PlaybackService}/.github/policies/jit.yml (100%) rename {tools/PlaybackService => PlaybackService}/.github/workflows/ci.yaml (100%) rename {tools/PlaybackService => PlaybackService}/.gitignore (100%) rename {tools/PlaybackService => PlaybackService}/PlaybackService.sln (100%) rename {tools/PlaybackService => PlaybackService}/README.md (100%) rename {tools/PlaybackService => PlaybackService}/deployment/playbackservice.yaml (100%) rename {tools/PlaybackService => PlaybackService}/src/AzureServiceFactory.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/Caches/KeyCache.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/Controllers/KeyDeliverController.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/Controllers/PlaybackController.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/Dockerfile (100%) rename {tools/PlaybackService => PlaybackService}/src/IBlobClientFactory.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/Middlewares/ContentTypeInjectionForShakaPlayer.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/Middlewares/CustomAuthenticationHandler.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/Middlewares/CustomAuthenticationHandlerOptions.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/Middlewares/GlobalExceptionHandler.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/PlaybackService.csproj (100%) rename {tools/PlaybackService => PlaybackService}/src/Program.cs (100%) rename {tools/PlaybackService => PlaybackService}/src/appsettings.Development.json (100%) rename {tools/PlaybackService => PlaybackService}/src/appsettings.json (100%) rename {tools/PlaybackService => PlaybackService}/src/wwwroot/favicon.ico (100%) rename {tools/PlaybackService => PlaybackService}/src/wwwroot/index.html (100%) rename {tools/PlaybackService => PlaybackService}/src/wwwroot/index.js (100%) rename {tools/PlaybackService => PlaybackService}/src/wwwroot/shaka-player.compiled.js (100%) rename {tools/PlaybackService => PlaybackService}/test/KeyDeliverControllerTest.cs (100%) rename {tools/PlaybackService => PlaybackService}/test/PlaybackControllerTest.cs (100%) rename {tools/PlaybackService => PlaybackService}/test/PlaybackService.Test.csproj (100%) rename {tools/PlaybackService => PlaybackService}/test/TestBase.cs (100%) rename {tools/PlaybackService => PlaybackService}/test/test-data/dash.ingested.mpd (100%) rename {tools/PlaybackService => PlaybackService}/test/test-data/dash.mpd (100%) rename {tools/PlaybackService => PlaybackService}/test/test-data/hls.ingested.m3u8 (100%) rename {tools/PlaybackService => PlaybackService}/test/test-data/hls.m3u8 (100%) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 133d9f3..87ab5fc 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -68,16 +68,16 @@ jobs: - name: Build and publish run: | - dotnet publish -c Release tools/PlaybackService + dotnet publish -c Release PlaybackService - name: Test run: | - dotnet test -c Release --no-build tools/PlaybackService + dotnet test -c Release --no-build PlaybackService - name: Build Container Image uses: docker/build-push-action@v4 with: - context: tools/PlaybackService/src/ + context: PlaybackService/src/ tags: amstestpublic.azurecr.io/azure-media-migration/playback-service:${{ github.sha }}, amstestpublic.azurecr.io/azure-media-migration/playback-service:latest - name: Log in to the Container registry @@ -106,6 +106,6 @@ jobs: with: namespace: amstest manifests: | - tools/PlaybackService/deployment/playbackservice.yaml + PlaybackService/deployment/playbackservice.yaml images: | amstestpublic.azurecr.io/azure-media-migration/playback-service:${{ github.sha }} \ No newline at end of file diff --git a/tools/PlaybackService/.github/ISSUE_TEMPLATE/JitAccess.yml b/PlaybackService/.github/ISSUE_TEMPLATE/JitAccess.yml similarity index 100% rename from tools/PlaybackService/.github/ISSUE_TEMPLATE/JitAccess.yml rename to PlaybackService/.github/ISSUE_TEMPLATE/JitAccess.yml diff --git a/tools/PlaybackService/.github/acl/access.yml b/PlaybackService/.github/acl/access.yml similarity index 100% rename from tools/PlaybackService/.github/acl/access.yml rename to PlaybackService/.github/acl/access.yml diff --git a/tools/PlaybackService/.github/compliance/inventory.yml b/PlaybackService/.github/compliance/inventory.yml similarity index 100% rename from tools/PlaybackService/.github/compliance/inventory.yml rename to PlaybackService/.github/compliance/inventory.yml diff --git a/tools/PlaybackService/.github/policies/branch-protection.yml b/PlaybackService/.github/policies/branch-protection.yml similarity index 100% rename from tools/PlaybackService/.github/policies/branch-protection.yml rename to PlaybackService/.github/policies/branch-protection.yml diff --git a/tools/PlaybackService/.github/policies/jit.yml b/PlaybackService/.github/policies/jit.yml similarity index 100% rename from tools/PlaybackService/.github/policies/jit.yml rename to PlaybackService/.github/policies/jit.yml diff --git a/tools/PlaybackService/.github/workflows/ci.yaml b/PlaybackService/.github/workflows/ci.yaml similarity index 100% rename from tools/PlaybackService/.github/workflows/ci.yaml rename to PlaybackService/.github/workflows/ci.yaml diff --git a/tools/PlaybackService/.gitignore b/PlaybackService/.gitignore similarity index 100% rename from tools/PlaybackService/.gitignore rename to PlaybackService/.gitignore diff --git a/tools/PlaybackService/PlaybackService.sln b/PlaybackService/PlaybackService.sln similarity index 100% rename from tools/PlaybackService/PlaybackService.sln rename to PlaybackService/PlaybackService.sln diff --git a/tools/PlaybackService/README.md b/PlaybackService/README.md similarity index 100% rename from tools/PlaybackService/README.md rename to PlaybackService/README.md diff --git a/tools/PlaybackService/deployment/playbackservice.yaml b/PlaybackService/deployment/playbackservice.yaml similarity index 100% rename from tools/PlaybackService/deployment/playbackservice.yaml rename to PlaybackService/deployment/playbackservice.yaml diff --git a/tools/PlaybackService/src/AzureServiceFactory.cs b/PlaybackService/src/AzureServiceFactory.cs similarity index 100% rename from tools/PlaybackService/src/AzureServiceFactory.cs rename to PlaybackService/src/AzureServiceFactory.cs diff --git a/tools/PlaybackService/src/Caches/KeyCache.cs b/PlaybackService/src/Caches/KeyCache.cs similarity index 100% rename from tools/PlaybackService/src/Caches/KeyCache.cs rename to PlaybackService/src/Caches/KeyCache.cs diff --git a/tools/PlaybackService/src/Controllers/KeyDeliverController.cs b/PlaybackService/src/Controllers/KeyDeliverController.cs similarity index 100% rename from tools/PlaybackService/src/Controllers/KeyDeliverController.cs rename to PlaybackService/src/Controllers/KeyDeliverController.cs diff --git a/tools/PlaybackService/src/Controllers/PlaybackController.cs b/PlaybackService/src/Controllers/PlaybackController.cs similarity index 100% rename from tools/PlaybackService/src/Controllers/PlaybackController.cs rename to PlaybackService/src/Controllers/PlaybackController.cs diff --git a/tools/PlaybackService/src/Dockerfile b/PlaybackService/src/Dockerfile similarity index 100% rename from tools/PlaybackService/src/Dockerfile rename to PlaybackService/src/Dockerfile diff --git a/tools/PlaybackService/src/IBlobClientFactory.cs b/PlaybackService/src/IBlobClientFactory.cs similarity index 100% rename from tools/PlaybackService/src/IBlobClientFactory.cs rename to PlaybackService/src/IBlobClientFactory.cs diff --git a/tools/PlaybackService/src/Middlewares/ContentTypeInjectionForShakaPlayer.cs b/PlaybackService/src/Middlewares/ContentTypeInjectionForShakaPlayer.cs similarity index 100% rename from tools/PlaybackService/src/Middlewares/ContentTypeInjectionForShakaPlayer.cs rename to PlaybackService/src/Middlewares/ContentTypeInjectionForShakaPlayer.cs diff --git a/tools/PlaybackService/src/Middlewares/CustomAuthenticationHandler.cs b/PlaybackService/src/Middlewares/CustomAuthenticationHandler.cs similarity index 100% rename from tools/PlaybackService/src/Middlewares/CustomAuthenticationHandler.cs rename to PlaybackService/src/Middlewares/CustomAuthenticationHandler.cs diff --git a/tools/PlaybackService/src/Middlewares/CustomAuthenticationHandlerOptions.cs b/PlaybackService/src/Middlewares/CustomAuthenticationHandlerOptions.cs similarity index 100% rename from tools/PlaybackService/src/Middlewares/CustomAuthenticationHandlerOptions.cs rename to PlaybackService/src/Middlewares/CustomAuthenticationHandlerOptions.cs diff --git a/tools/PlaybackService/src/Middlewares/GlobalExceptionHandler.cs b/PlaybackService/src/Middlewares/GlobalExceptionHandler.cs similarity index 100% rename from tools/PlaybackService/src/Middlewares/GlobalExceptionHandler.cs rename to PlaybackService/src/Middlewares/GlobalExceptionHandler.cs diff --git a/tools/PlaybackService/src/PlaybackService.csproj b/PlaybackService/src/PlaybackService.csproj similarity index 100% rename from tools/PlaybackService/src/PlaybackService.csproj rename to PlaybackService/src/PlaybackService.csproj diff --git a/tools/PlaybackService/src/Program.cs b/PlaybackService/src/Program.cs similarity index 100% rename from tools/PlaybackService/src/Program.cs rename to PlaybackService/src/Program.cs diff --git a/tools/PlaybackService/src/appsettings.Development.json b/PlaybackService/src/appsettings.Development.json similarity index 100% rename from tools/PlaybackService/src/appsettings.Development.json rename to PlaybackService/src/appsettings.Development.json diff --git a/tools/PlaybackService/src/appsettings.json b/PlaybackService/src/appsettings.json similarity index 100% rename from tools/PlaybackService/src/appsettings.json rename to PlaybackService/src/appsettings.json diff --git a/tools/PlaybackService/src/wwwroot/favicon.ico b/PlaybackService/src/wwwroot/favicon.ico similarity index 100% rename from tools/PlaybackService/src/wwwroot/favicon.ico rename to PlaybackService/src/wwwroot/favicon.ico diff --git a/tools/PlaybackService/src/wwwroot/index.html b/PlaybackService/src/wwwroot/index.html similarity index 100% rename from tools/PlaybackService/src/wwwroot/index.html rename to PlaybackService/src/wwwroot/index.html diff --git a/tools/PlaybackService/src/wwwroot/index.js b/PlaybackService/src/wwwroot/index.js similarity index 100% rename from tools/PlaybackService/src/wwwroot/index.js rename to PlaybackService/src/wwwroot/index.js diff --git a/tools/PlaybackService/src/wwwroot/shaka-player.compiled.js b/PlaybackService/src/wwwroot/shaka-player.compiled.js similarity index 100% rename from tools/PlaybackService/src/wwwroot/shaka-player.compiled.js rename to PlaybackService/src/wwwroot/shaka-player.compiled.js diff --git a/tools/PlaybackService/test/KeyDeliverControllerTest.cs b/PlaybackService/test/KeyDeliverControllerTest.cs similarity index 100% rename from tools/PlaybackService/test/KeyDeliverControllerTest.cs rename to PlaybackService/test/KeyDeliverControllerTest.cs diff --git a/tools/PlaybackService/test/PlaybackControllerTest.cs b/PlaybackService/test/PlaybackControllerTest.cs similarity index 100% rename from tools/PlaybackService/test/PlaybackControllerTest.cs rename to PlaybackService/test/PlaybackControllerTest.cs diff --git a/tools/PlaybackService/test/PlaybackService.Test.csproj b/PlaybackService/test/PlaybackService.Test.csproj similarity index 100% rename from tools/PlaybackService/test/PlaybackService.Test.csproj rename to PlaybackService/test/PlaybackService.Test.csproj diff --git a/tools/PlaybackService/test/TestBase.cs b/PlaybackService/test/TestBase.cs similarity index 100% rename from tools/PlaybackService/test/TestBase.cs rename to PlaybackService/test/TestBase.cs diff --git a/tools/PlaybackService/test/test-data/dash.ingested.mpd b/PlaybackService/test/test-data/dash.ingested.mpd similarity index 100% rename from tools/PlaybackService/test/test-data/dash.ingested.mpd rename to PlaybackService/test/test-data/dash.ingested.mpd diff --git a/tools/PlaybackService/test/test-data/dash.mpd b/PlaybackService/test/test-data/dash.mpd similarity index 100% rename from tools/PlaybackService/test/test-data/dash.mpd rename to PlaybackService/test/test-data/dash.mpd diff --git a/tools/PlaybackService/test/test-data/hls.ingested.m3u8 b/PlaybackService/test/test-data/hls.ingested.m3u8 similarity index 100% rename from tools/PlaybackService/test/test-data/hls.ingested.m3u8 rename to PlaybackService/test/test-data/hls.ingested.m3u8 diff --git a/tools/PlaybackService/test/test-data/hls.m3u8 b/PlaybackService/test/test-data/hls.m3u8 similarity index 100% rename from tools/PlaybackService/test/test-data/hls.m3u8 rename to PlaybackService/test/test-data/hls.m3u8