Merge pull request #5 from alma-oss/feature/adjust-repo

Move repository

Author: MortalFlesh

.github/workflows/publish.yaml

@@ -11,7 +11,6 @@ jobs:
 
     permissions:
       contents: read
-      packages: write
 
     steps:
       - uses: actions/checkout@v4
@@ -21,20 +20,8 @@ jobs:
         with:
           dotnet-version: 9.x
 
-      - name: Generate token
-        id: generate_token
-        uses: almacareer/dex-github-app-token@v1
-        with:
-          app_id: ${{ secrets.PRC_ACTIONS_INTERNAL_APPID }}
-          installation_id: ${{ secrets.PRC_ACTIONS_INTERNAL_INSTALLATION_ID }}
-          private_key: ${{ secrets.PRC_ACTIONS_INTERNAL_KEY }}
-
-      - name: Publish package
+      - name: Publish to NuGet.org
         env:
-          PRIVATE_FEED_USER: ${{ github.repository_owner }}
-          PRIVATE_FEED_PASS: ${{ secrets.GITHUB_TOKEN }}
-          NUGET_SERVER_TOKEN: ${{ steps.generate_token.outputs.token }}
-          NUGET_SERVER_ORGANIZATION: ${{ github.repository_owner }}
-          NUGET_SERVER_REPOSITORY: "prc-nuget-server"
+          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
           DOTNET_ROLL_FORWARD: latestMajor
-        run: ./build.sh -t publish
+        run: ./build.sh -t publish no-lint

.github/workflows/tests.yaml

@@ -28,4 +28,4 @@ jobs:
           PRIVATE_FEED_USER: ${{ github.repository_owner }}
           PRIVATE_FEED_PASS: ${{ secrets.GITHUB_TOKEN }}
           DOTNET_ROLL_FORWARD: latestMajor
-        run: ${{ matrix.os.run }} -t tests
+        run: ${{ matrix.os.run }} -t tests no-lint

ApplicationStatus.fsproj

@@ -6,8 +6,11 @@
     <OutputType>Library</OutputType>
     <PackageId>Alma.ApplicationStatus</PackageId>
     <Version>6.1.0</Version>
-    <RepositoryUrl>https://github.com/almacareer/prc-fapplicationStatus.git</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/almacareer/prc-fapplicationStatus</PackageProjectUrl>
+    <Authors>Almacareer</Authors>
+    <Description>Types for an common Application status representation.</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/alma-oss/fapplicationStatus.git</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/alma-oss/fapplicationStatus</PackageProjectUrl>
   </PropertyGroup>
 
   <ItemGroup>

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 <!-- There is always Unreleased section on the top. Subsections (Add, Changed, Fix, Removed) should be Add as needed. -->
 ## Unreleased
+- Move repository
+- Remove `Nomad` fields
 
 ## 6.1.0 - 2025-03-17
 - Update dependencies

LICENSE.md

@@ -0,0 +1,21 @@
+### The MIT License (MIT) ###
+
+Copyright (c) Alma Career Czechia s.r.o.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,22 +1,13 @@
 Application Status
 ==================
 
-> Types for an common Application status representation used in LMC.
+[![NuGet](https://img.shields.io/nuget/v/Alma.ApplicationStatus.svg)](https://www.nuget.org/packages/Alma.ApplicationStatus)
+[![NuGet Downloads](https://img.shields.io/nuget/dt/Alma.ApplicationStatus.svg)](https://www.nuget.org/packages/Alma.ApplicationStatus)
+[![Tests](https://github.com/alma-oss/fapplicationStatus/actions/workflows/tests.yaml/badge.svg)](https://github.com/alma-oss/fapplicationStatus/actions/workflows/tests.yaml)
 
-## Install
-
-Add following into `paket.dependencies`
-```
-source https://nuget.pkg.github.com/almacareer/index.json username: "%PRIVATE_FEED_USER%" password: "%PRIVATE_FEED_PASS%"
-# LMC Nuget dependencies:
-nuget Alma.ApplicationStatus
-```
+> Types for an common Application status representation.
 
-NOTE: For local development, you have to create ENV variables with your github personal access token.
-```sh
-export PRIVATE_FEED_USER='{GITHUB USERNANME}'
-export PRIVATE_FEED_PASS='{TOKEN}'	# with permissions: read:packages
-```
+## Install
 
 Add following into `paket.references`
 ```
@@ -34,8 +25,6 @@ type CurrentApplication = {
     Dependencies: Dependencies
     ServiceStatus: ServiceStatus
     LoggerFactory: ILoggerFactory
-    NomadJobName: NomadJobName
-    NomadAllocationId: NomadAllocationId
     DockerImageVersion: DockerImageVersion
 }
 
@@ -59,10 +48,6 @@ let createStatus (currentApplication: CurrentApplication) =
 
         interface ApplicationStatusFeature.IDockerApplication with
             member __.DockerImageVersion = currentApplication.DockerImageVersion
-
-        interface ApplicationStatusFeature.INomadApplication with
-            member __.NomadJobName = currentApplication.NomadJobName
-            member __.NomadAllocationId = currentApplication.NomadAllocationId
     }
 ```
 

build/Build.fs

@@ -20,12 +20,12 @@ let main args =
     Targets.init {
         Project = {
             Name = "Alma.ApplicationStatus"
-            Summary = "Types for an common Application status representation used in LMC."
+            Summary = "Types for an common Application status representation."
             Git = Git.init ()
         }
         Specs =
             Spec.defaultLibrary
-            |> Spec.mapLibrary (fun library -> { library with NugetApi = NugetApi.Organization "almacareer" })
+            |> Spec.mapLibrary (fun library -> { library with NugetApi = NugetApi.KeyInEnvironment "NUGET_API_KEY" })
     }
 
     args |> Args.run

paket.dependencies

@@ -4,10 +4,8 @@ source https://api.nuget.org/v3/index.json
 nuget FSharp.Core ~> 9.0
 nuget FSharp.Data ~> 6.0
 
-source https://nuget.pkg.github.com/almacareer/index.json username: "%PRIVATE_FEED_USER%" password: "%PRIVATE_FEED_PASS%"
-# LMC Nuget dependencies:
-nuget Alma.EnvironmentModel ~> 8.1
-nuget Alma.ServiceIdentification ~> 10.0
+nuget Alma.EnvironmentModel ~> 9.0
+nuget Alma.ServiceIdentification ~> 10.1
 
 nuget Expecto
 nuget YoloDev.Expecto.TestSdk

paket.lock

@@ -1,19 +1,18 @@
 RESTRICTION: == net9.0
 NUGET
-  remote: https://nuget.pkg.github.com/almacareer/index.json
-    Alma.EnvironmentModel (8.1.0)
-      Alma.ErrorHandling (>= 10.0 < 11.0)
-      Alma.ServiceIdentification (>= 10.0 < 11.0)
-      FSharp.Core (>= 9.0.201 < 10.0)
-    Alma.ErrorHandling (10.0.0)
-      FSharp.Core (>= 9.0.201 < 10.0)
-    Alma.ServiceIdentification (10.0.0)
-      FSharp.Core (>= 9.0.201 < 10.0)
   remote: https://api.nuget.org/v3/index.json
+    Alma.EnvironmentModel (9.1)
+      Alma.ServiceIdentification (>= 10.1 < 11.0)
+      Feather.ErrorHandling (>= 1.0 < 2.0)
+      FSharp.Core (>= 9.0.303 < 10.0)
+    Alma.ServiceIdentification (10.1)
+      FSharp.Core (>= 9.0.201 < 10.0)
     Expecto (10.2.2)
       FSharp.Core (>= 7.0.200)
       Mono.Cecil (>= 0.11.4 < 1.0)
-    FSharp.Core (9.0.201)
+    Feather.ErrorHandling (1.0)
+      FSharp.Core (>= 9.0.201 < 10.0)
+    FSharp.Core (9.0.303)
     FSharp.Data (6.6)
       FSharp.Core (>= 6.0.1)
       FSharp.Data.Csv.Core (>= 6.6)

src/ApplicationStatus.fs

@@ -13,9 +13,6 @@ type GitRepository = GitRepository of string
 
 type DockerImageVersion = DockerImageVersion of string
 
-type NomadJobName = NomadJobName of string
-type NomadAllocationId = NomadAllocationId of string
-
 [<RequireQualifiedAccess>]
 module GitBranch =
     let value (GitBranch value) = value
@@ -36,16 +33,6 @@ module DockerImageVersion =
     let value (DockerImageVersion value) = value
     let empty = DockerImageVersion ""
 
-[<RequireQualifiedAccess>]
-module NomadJobName =
-    let value (NomadJobName value) = value
-    let empty = NomadJobName ""
-
-[<RequireQualifiedAccess>]
-module NomadAllocationId =
-    let value (NomadAllocationId value) = value
-    let empty = NomadAllocationId ""
-
 //
 // Application Status Interfaces
 //
@@ -64,10 +51,6 @@ module ApplicationStatusFeature =
     type IDockerApplication =
         abstract member DockerImageVersion: DockerImageVersion
 
-    type INomadApplication =
-        abstract member NomadJobName: NomadJobName
-        abstract member NomadAllocationId: NomadAllocationId
-
     module internal Matching =
         let (|IsCurrentApplication|_|): obj -> ICurrentApplication option = box >> function
             | :? ICurrentApplication as currentApplication -> Some currentApplication
@@ -81,10 +64,6 @@ module ApplicationStatusFeature =
             | :? IDockerApplication as dockerAppliation -> Some dockerAppliation
             | _ -> None
 
-        let (|IsNomadApplication|_|): obj -> INomadApplication option = box >> function
-            | :? INomadApplication as nomadApplication -> Some nomadApplication
-            | _ -> None
-
 //
 // Application Status
 //
@@ -102,8 +81,6 @@ type ApplicationStatus = {
     [<XmlElement("sourceRevision")>] SourceRevision: string
     [<XmlElement("repository")>] Repository: string
     [<XmlElement("hostName")>] HostName: string
-    [<XmlElement("nomadJobName")>] NomadJobName: string
-    [<XmlElement("nomadAllocId")>] NomadAllocId: string
 }
 
 [<RequireQualifiedAccess>]
@@ -148,13 +125,4 @@ module ApplicationStatus =
                 | _ -> ""
 
             HostName = try Dns.GetHostName() with _ -> ""
-
-            NomadJobName =
-                match application with
-                | IsNomadApplication nomadApplication -> nomadApplication.NomadJobName |> NomadJobName.value
-                | _ -> ""
-            NomadAllocId =
-                match application with
-                | IsNomadApplication nomadApplication -> nomadApplication.NomadAllocationId |> NomadAllocationId.value
-                | _ -> ""
         }