Fix HealthCheck auth endpoint for alternate Azure Clouds (Server 2022.1 stream)

.gitignore

@@ -65,4 +65,5 @@ source/OctopusTools.v2.ncrunchsolution
 /publish/
 TestResult.xml
 TestResults/
-.idea/
+.idea/
+*.runsettings

.teamcity/octopus/main/Extensions.kt

@@ -2,10 +2,12 @@ package octopus.main
 
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
 
 fun BuildType.includeVcs(): BuildType {
     this.vcs {
-        root(AbsoluteId("SharedGitHubVcsRoot"))
+        root(AbsoluteId("OctopusDeploy_LIbraries_Sashimi_SharedGitHubVcsRoot"))
 
         excludeDefaultBranchChanges = true
         showDependenciesChanges = true
@@ -19,11 +21,25 @@ fun BuildType.commitStatusPublisher(): BuildType {
             publisher = github {
                 githubUrl = "https://api.github.com"
                 authType = personalToken {
-                    token = "%commitStatusPublisher.apiKey%"
+                    token = "credentialsJSON:d2d6ff31-56f1-4893-a448-f7a517da6c88"
                 }
             }
         }
     }
     return this
 }
 
+fun BuildType.githubPullRequests(): BuildType {
+    this.features {
+        pullRequests {
+            provider = github {
+                authType = token {
+                    token = "credentialsJSON:e3abf97f-cad5-4d88-9a7a-f588c55c53ed"
+                }
+                filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER
+            }
+        }
+    }
+    return this
+}
+

.teamcity/octopus/main/MainProject.kt

@@ -15,7 +15,7 @@ object MainProject : Project({
             PublishToFeedzIo
     )
 
-    buildTypesToRegister.forEach { buildType(it.includeVcs().commitStatusPublisher()) }
+    buildTypesToRegister.forEach { buildType(it.includeVcs().commitStatusPublisher().githubPullRequests()) }
     buildTypesOrder = buildTypesToRegister.toList()
 
     sequential {

.teamcity/octopus/main/MonoTestingProject.kt

@@ -50,7 +50,7 @@ class MonoTestingProject : Project({
         })
     }
 
-    buildTypesToRegister.forEach { buildType(it.commitStatusPublisher()) }
+    buildTypesToRegister.forEach { buildType(it.commitStatusPublisher().githubPullRequests()) }
     buildTypesOrder = buildTypes.toList()
 
     params {

.teamcity/octopus/main/NetFxTestingProject.kt

@@ -12,8 +12,6 @@ class NetFxTestingProject : Project({
 
     val buildTypesToRegister = sequence {
         val items = listOf(
-                ("Windows 2008" to "2008"),
-                ("Windows 2008 R2" to "2008R2"),
                 ("Windows 2012" to "2012"),
                 ("Windows 2012 R2" to "2012R2"),
                 ("Windows 2016" to "2016"),
@@ -30,15 +28,11 @@ class NetFxTestingProject : Project({
                     equals("system.Octopus.OSVersion", item.second)
                 }
             }
-            if(item.second.startsWith("2008")) {
-                yield(CalamariOnlyTestBuildType(block))
-            } else {
-                yield(DotNetTestBuildType(block))
-            }
+            yield(DotNetTestBuildType(block))
         }
     }
 
-    buildTypesToRegister.forEach { buildType(it.commitStatusPublisher()) }
+    buildTypesToRegister.forEach { buildType(it.commitStatusPublisher().githubPullRequests()) }
     buildTypesOrder = buildTypes.toList()
 
     params {

.teamcity/octopus/main/NetcoreTestingProject.kt

@@ -13,7 +13,6 @@ class NetcoreTestingProject : Project({
                 ("Amazon Linux" to "AmazonLinux"),
                 ("Ubuntu" to "Ubuntu"),
                 ("openSUSE Leap" to "openSUSE"),
-                ("SUSE LES" to "SLES"),
                 ("CentOS" to "CentOS"),
                 ("Fedora" to "Fedora"),
                 ("Debian" to "Debian"),
@@ -48,20 +47,9 @@ class NetcoreTestingProject : Project({
                 exists("system.Octopus.DotnetSdk3.1")
             }
         })
-        yield(DotNetTestBuildType {
-            id("Mac OSX".toId(projectName.toId()))
-            name = "Mac OSX"
-            params {
-                param("dotnet_runtime", "osx-x64")
-            }
-            requirements {
-                exists("DotNetCLI")
-                equals("teamcity.agent.jvm.os.name", "Mac OS X")
-            }
-        })
     }
 
-    buildTypesToRegister.forEach { buildType(it.commitStatusPublisher()) }
+    buildTypesToRegister.forEach { buildType(it.commitStatusPublisher().githubPullRequests()) }
     buildTypesOrder = buildTypes.toList()
 
     params {

.teamcity/octopus/main/buildtypes/PublishToFeedzIo.kt

@@ -1,11 +1,12 @@
 package octopus.main.buildtypes
 
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.nuGetPublish
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
 
 object PublishToFeedzIo : BuildType({
-    name = "Publish to Feedz.io"
+    name = "Chain: Build and Test and Publish to Feedz.io"
 
     buildNumberPattern = "${Build.depParamRefs.buildNumber}"
 
@@ -15,32 +16,109 @@ object PublishToFeedzIo : BuildType({
             toolPath = "%teamcity.tool.NuGet.CommandLine.DEFAULT%"
             packages = "*.nupkg"
             serverUrl = "%InternalNuget.OctopusDependeciesFeedUrl%"
-            apiKey = "%nuGetPublish.apiKey%"
+            apiKey = "credentialsJSON:a7d4426a-7256-4df7-a953-266292e6ad81"
             args = "-Timeout 1200"
         }
     }
 
     triggers {
         vcs {
             branchFilter = """
-                ## We actually want to publish all builds
-                +:refs/tags/*
                 +:<default>
-                +:refs/heads/*
+                +:pull/*
+                +:refs/tags/*
             """.trimIndent()
         }
     }
 
     dependencies {
         dependency(Build) {
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+            }
+
             artifacts {
                 cleanDestination = true
                 artifactRules = "*.nupkg"
             }
         }
+
+        dependency(RelativeId("NetcoreTesting_AmazonLinux")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("NetcoreTesting_Ubuntu")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("NetcoreTesting_OpenSUSE")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("NetcoreTesting_CentOS")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("NetcoreTesting_Fedora")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("NetcoreTesting_Debian")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("NetcoreTesting_Rhel")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("NetcoreTesting_Windows")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+
+        dependency(RelativeId("WindowsNetFxTesting_2012")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("WindowsNetFxTesting_2012r2")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("WindowsNetFxTesting_2016")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
+        dependency(RelativeId("WindowsNetFxTesting_2019")){
+            snapshot {
+                onDependencyFailure = FailureAction.CANCEL
+                onDependencyCancel = FailureAction.CANCEL
+            }
+        }
     }
 
     requirements {
-        equals("system.Octopus.Purpose", "Build")
+        startsWith("system.agent.name", "nautilus-")
     }
 })

.teamcity/octopus/main/buildtypes/TestBuildType.kt

@@ -15,7 +15,7 @@ abstract class TestBuildType(block: BuildType.() -> Unit) : BuildType({
     buildNumberPattern = "${Build.depParamRefs.buildNumber}"
 
     vcs {
-        AbsoluteId("SharedGitHubVcsRoot")
+        AbsoluteId("OctopusDeploy_LIbraries_Sashimi_SharedGitHubVcsRoot")
 
         checkoutMode = CheckoutMode.MANUAL
         cleanCheckout = true

.teamcity/patches/buildTypes/Build.kts

@@ -45,10 +45,18 @@ changeBuildType(RelativeId("Build")) {
                 publisher = github {
                     githubUrl = "https://api.github.com"
                     authType = personalToken {
-                        token = "%commitStatusPublisher.apiKey%"
+                        token = "credentialsJSON:d2d6ff31-56f1-4893-a448-f7a517da6c88"
                     }
                 }
             }
         }
+        feature1.apply {
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "credentialsJSON:7416c240-5c67-48ed-97a3-f5fe49d0e744"
+                }
+            }
+        }
     }
 }

.teamcity/patches/buildTypes/NetcoreTesting_AmazonLinux.kts

@@ -21,10 +21,18 @@ changeBuildType(RelativeId("NetcoreTesting_AmazonLinux")) {
                 publisher = github {
                     githubUrl = "https://api.github.com"
                     authType = personalToken {
-                        token = "%commitStatusPublisher.apiKey%"
+                        token = "credentialsJSON:d2d6ff31-56f1-4893-a448-f7a517da6c88"
                     }
                 }
             }
         }
+        feature1.apply {
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "credentialsJSON:7416c240-5c67-48ed-97a3-f5fe49d0e744"
+                }
+            }
+        }
     }
 }

.teamcity/patches/buildTypes/NetcoreTesting_CentOS.kts

@@ -21,10 +21,18 @@ changeBuildType(RelativeId("NetcoreTesting_CentOS")) {
                 publisher = github {
                     githubUrl = "https://api.github.com"
                     authType = personalToken {
-                        token = "%commitStatusPublisher.apiKey%"
+                        token = "credentialsJSON:d2d6ff31-56f1-4893-a448-f7a517da6c88"
                     }
                 }
             }
         }
+        feature1.apply {
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "credentialsJSON:7416c240-5c67-48ed-97a3-f5fe49d0e744"
+                }
+            }
+        }
     }
 }

.teamcity/patches/buildTypes/NetcoreTesting_Debian.kts

@@ -21,10 +21,18 @@ changeBuildType(RelativeId("NetcoreTesting_Debian")) {
                 publisher = github {
                     githubUrl = "https://api.github.com"
                     authType = personalToken {
-                        token = "%commitStatusPublisher.apiKey%"
+                        token = "credentialsJSON:d2d6ff31-56f1-4893-a448-f7a517da6c88"
                     }
                 }
             }
         }
+        feature1.apply {
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "credentialsJSON:7416c240-5c67-48ed-97a3-f5fe49d0e744"
+                }
+            }
+        }
     }
 }

.teamcity/patches/buildTypes/NetcoreTesting_Fedora.kts

@@ -21,10 +21,18 @@ changeBuildType(RelativeId("NetcoreTesting_Fedora")) {
                 publisher = github {
                     githubUrl = "https://api.github.com"
                     authType = personalToken {
-                        token = "%commitStatusPublisher.apiKey%"
+                        token = "credentialsJSON:d2d6ff31-56f1-4893-a448-f7a517da6c88"
                     }
                 }
             }
         }
+        feature1.apply {
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "credentialsJSON:7416c240-5c67-48ed-97a3-f5fe49d0e744"
+                }
+            }
+        }
     }
 }

.teamcity/patches/buildTypes/NetcoreTesting_OpenSUSE.kts

@@ -21,10 +21,18 @@ changeBuildType(RelativeId("NetcoreTesting_OpenSUSE")) {
                 publisher = github {
                     githubUrl = "https://api.github.com"
                     authType = personalToken {
-                        token = "%commitStatusPublisher.apiKey%"
+                        token = "credentialsJSON:d2d6ff31-56f1-4893-a448-f7a517da6c88"
                     }
                 }
             }
         }
+        feature1.apply {
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "credentialsJSON:7416c240-5c67-48ed-97a3-f5fe49d0e744"
+                }
+            }
+        }
     }
 }