Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/octo args to string bug #2469

Merged
merged 4 commits into from
Mar 5, 2020
Merged

Fix/octo args to string bug #2469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06d7d9d
adds test to reproduce error
ids-pfinn Feb 12, 2020
55c3561
fixes bug and adds tests
ids-pfinn Feb 12, 2020
2e75509
renames test to follow naming pattern
ids-pfinn Feb 12, 2020
6d479f6
fixes a unit test that I missed
ids-pfinn Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/app/Fake.Tools.Octo/Octo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ let private optionalObjParam p o =
let private stringListParam p os =
let sb = Text.StringBuilder()
for o in os do
sb.Append (sprintf " --%s=%s" p (o.ToString())) |> ignore
sb.ToString()
sb.Append (sprintf "--%s=%s " p (o.ToString())) |> ignore
sb.ToString().Trim()

let private flag p b = if b then sprintf " --%s" p else ""
let private flag p b = if b then sprintf "--%s" p else ""

let private releaseCommandLine (opts:CreateReleaseOptions) =
[ (optionalStringParam "project" (String.liftString opts.Project))
Expand Down Expand Up @@ -228,7 +228,7 @@ let private deleteCommandLine (opts:DeleteReleasesOptions) =
(optionalStringParam "channel" (opts.Channel)) ]
|> List.filter String.isNotNullOrEmpty

let private serverCommandLine (opts:ServerOptions) =
let internal serverCommandLine (opts:ServerOptions) =
[ (optionalStringParam "server" (String.liftString opts.ServerUrl))
(optionalStringParam "apikey" (String.liftString opts.ApiKey)) ]
|> List.filter String.isNotNullOrEmpty
Expand Down
2 changes: 1 addition & 1 deletion src/test/Fake.Core.UnitTests/Fake.Core.UnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<Compile Include="Fake.Core.Context.fs" />
<Compile Include="Fake.Core.FakeVar.fs" />
<Compile Include="Fake.Runtime.fs" />
<Compile Include="Fake.Tools.Testing.Octo.fs" />
<Compile Include="Fake.Tools.Octo.fs" />
<Compile Include="Main.fs" />
<None Include="TestFiles/Fake.DotNet.AssemblyInfoFile/AssemblyInfo.cs" CopyToOutputDirectory="PreserveNewest" />
<None Include="TestFiles/Fake.DotNet.AssemblyInfoFile/AssemblyInfo.fs" CopyToOutputDirectory="PreserveNewest" />
Expand Down
255 changes: 255 additions & 0 deletions src/test/Fake.Core.UnitTests/Fake.Tools.Octo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
module Fake.Tools.Testing.Octo

open Expecto

[<Tests>]
let defaultTests =
testList "Fake.Tools.Octo Tests" [
testCase "List Environments" <| fun _ ->
let expected = ["list-environments"]
let actual =
Fake.Tools.Octo.Command.ListEnvironments
|> Fake.Tools.Octo.commandLine
Expect.hasLength actual expected.Length "ListEnvironment only has command"
Expect.sequenceEqual actual expected "ListEnvironment command should be the list-environments string"

testCase "Create Release Default" <| fun _ ->
let expectedCommand = [
"create-release"
]
let actual =
(Fake.Tools.Octo.releaseOptions, None)
|> Fake.Tools.Octo.Command.CreateRelease
|> Fake.Tools.Octo.commandLine
Expect.hasLength actual expectedCommand.Length "With default options only expect the command"
Expect.sequenceEqual actual expectedCommand "CreateRelease command should be the create-release string"

testCase "Push Command" <| fun _ ->
let expect = [
"push"
"--package=Package-1 --package=Package-2"
"--replace-existing"
]
let (pushOption: Fake.Tools.Octo.PushOptions) = {
Packages=["Package-1"; "Package-2"]
ReplaceExisting=true
Common={
ToolName="ToolName-1"
ToolPath="ToolPath-1"
WorkingDirectory="WorkingDirectory-1"
Server = {
ServerUrl="ServerUrl"
ApiKey="ApiKey"
}
Timeout=System.TimeSpan.MaxValue
}
}
let actual =
pushOption
|> Fake.Tools.Octo.Command.Push
|> Fake.Tools.Octo.commandLine
Expect.hasLength actual expect.Length ""
Expect.sequenceEqual actual expect ""

testCase "Create Release Fully Filled Out" <| fun _ ->
let expectedCommand = [
"create-release"
"--project=Project-1"
"--version=Version-1"
"--packageversion=PackageVersion-1"
"--package=Package-1 --package=Package-2"
"--packagesfolder=PackageFolder-1"
"--releasenotes=ReleaseNotes-1"
"--releasenotesfile=ReleaseNotesFile-1"
"--ignoreExisting"
"--channel=Channel-1"
"--ignorechannelrules"
]
let releaseOptions = {
Fake.Tools.Octo.releaseOptions with
Project="Project-1"
Version="Version-1"
PackageVersion="PackageVersion-1"
Packages=["Package-1"; "Package-2"]
PackagesFolder=Some "PackageFolder-1"
ReleaseNotes="ReleaseNotes-1"
ReleaseNotesFile="ReleaseNotesFile-1"
IgnoreExisting=true
Channel=Some "Channel-1"
Common=Fake.Tools.Octo.commonOptions
IgnoreChannelRules=true
}
let actual =
(releaseOptions, None)
|> Fake.Tools.Octo.Command.CreateRelease
|> Fake.Tools.Octo.commandLine
Expect.hasLength actual expectedCommand.Length ""
Expect.sequenceEqual actual expectedCommand ""

testCase "Create Release With Common" <| fun _ ->
let expectedCommand = [
"create-release"
"--project=Project-1"
"--version=Version-1"
"--packageversion=PackageVersion-1"
"--package=Package-1 --package=Package-2"
"--packagesfolder=PackageFolder-1"
"--releasenotes=ReleaseNotes-1"
"--releasenotesfile=ReleaseNotesFile-1"
"--ignoreExisting"
"--channel=Channel-1"
"--ignorechannelrules"
"--project=Project-1"
"--deployto=Env-1"
"--version=Version-1"
"--progress"
"--deploymenttimeout=10675199.02:48:05.4775807"
"--deploymentchecksleepcycle=10675199.02:48:05.4775807"
"--specificmachines=Machine-1"
"--channel=Channel-1"
]
let releaseOptions = {
Fake.Tools.Octo.releaseOptions with
Project="Project-1"
Version="Version-1"
PackageVersion="PackageVersion-1"
Packages=["Package-1"; "Package-2"]
PackagesFolder=Some "PackageFolder-1"
ReleaseNotes="ReleaseNotes-1"
ReleaseNotesFile="ReleaseNotesFile-1"
IgnoreExisting=true
Channel=Some "Channel-1"
Common=Fake.Tools.Octo.commonOptions
IgnoreChannelRules=true
}
let deployReleaseOptions: Fake.Tools.Octo.DeployReleaseOptions = {
Project="Project-1"
DeployTo="Env-1"
Version="Version-1"
Force=false
WaitForDeployment=false
NoRawLog=false
Progress=true
DeploymentTimeout=Some System.TimeSpan.MaxValue
DeploymentCheckSleepCycle=Some System.TimeSpan.MaxValue
SpecificMachines=Some "Machine-1"
Channel=Some "Channel-1"
Common = {
ToolName="ToolName-1"
ToolPath="ToolPath-1"
WorkingDirectory="WorkingDirectory-1"
Server = {
ServerUrl="ServerUrl"
ApiKey="ApiKey"
}
Timeout=System.TimeSpan.MaxValue
}
}

let actual =
(releaseOptions, Some deployReleaseOptions)
|> Fake.Tools.Octo.Command.CreateRelease
|> Fake.Tools.Octo.commandLine
Expect.hasLength actual expectedCommand.Length ""
Expect.sequenceEqual actual expectedCommand ""

testCase "Create Deploy Full Filled Out" <| fun _ ->
let expected = [
"deploy-release"
"--project=Project-1"
"--deployto=Environment-1"
"--version=123.123.123"
"--force"
"--waitfordeployment"
"--norawlog"
"--progress"
"--deploymenttimeout=10675199.02:48:05.4775807"
"--deploymentchecksleepcycle=10675199.02:48:05.4775807"
"--specificmachines=Machine-1"
"--channel=Channel-1"
]
let (deployReleaseOption:Fake.Tools.Octo.DeployReleaseOptions) = {
Project="Project-1"
DeployTo="Environment-1"
Version="123.123.123"
Force=true
WaitForDeployment=true
NoRawLog=true
Progress=true
DeploymentTimeout=Some System.TimeSpan.MaxValue
DeploymentCheckSleepCycle=Some System.TimeSpan.MaxValue
SpecificMachines=Some "Machine-1"
Channel=Some "Channel-1"
Common={
ToolName="ToolName-1"
ToolPath="ToolPath-1"
WorkingDirectory="WorkingDirectory-1"
Server = {
ServerUrl="ServerUrl"
ApiKey="ApiKey"
}
Timeout=System.TimeSpan.MaxValue
}
}

let actual =
deployReleaseOption
|> Fake.Tools.Octo.Command.DeployRelease
|> Fake.Tools.Octo.commandLine
Expect.hasLength actual expected.Length ""
Expect.sequenceEqual expected actual ""

testCase "Delete Release fully Fulled Out" <| fun _ ->
let expectedCommand = [
"delete-releases"
"--project=Project-1"
"--minversion=1.0.0"
"--maxversion=123.123.123"
"--channel=Channel-1"
]
let (deleteReleaseOptions: Fake.Tools.Octo.DeleteReleasesOptions) = {
Project="Project-1"
MinVersion="1.0.0"
MaxVersion="123.123.123"
Channel=Some "Channel-1"
Common={
ToolName="ToolName-1"
ToolPath="ToolPath-1"
WorkingDirectory="WorkingDirectory-1"
Server = {
ServerUrl="ServerUrl"
ApiKey="ApiKey"
}
Timeout=System.TimeSpan.MaxValue
}
}

let actual =
deleteReleaseOptions
|> Fake.Tools.Octo.Command.DeleteReleases
|> Fake.Tools.Octo.commandLine
Expect.hasLength actual expectedCommand.Length ""
Expect.sequenceEqual actual expectedCommand ""

testCase "Realistic Octo Args To Windows Command Line" <| fun _ ->
let setCommon (ps:Fake.Tools.Octo.Options) =
{
ps with
ToolPath = "Z:\tools"
ToolName = "octo.exe"
Server = {
ServerUrl = "https://myoctopus-server.com"
ApiKey = "octoApiKey"
}
}
let setReleaseParams = (fun (ro:Fake.Tools.Octo.CreateReleaseOptions) ->
{ ro with Project = "MyProject"; Version = "1234567890.12.34"; Packages=["MyPackage:1234567890.12.34"]; Common = setCommon ro.Common })
let setDeployParams = (fun (dOpt: Fake.Tools.Octo.DeployReleaseOptions) ->
{ dOpt with Project = "MyProject"; Version = "1234567890.12.34"; DeployTo = "MyEnvironment"; Common = setCommon dOpt.Common; Progress=true } |> Some)
let command = (Fake.Tools.Octo.CreateRelease ((setReleaseParams Fake.Tools.Octo.releaseOptions), (setDeployParams Fake.Tools.Octo.deployOptions)))
let releaseOptions = setReleaseParams Fake.Tools.Octo.releaseOptions

let args = (List.append (Fake.Tools.Octo.commandLine command) (Fake.Tools.Octo.serverCommandLine releaseOptions.Common.Server)) |> Fake.Core.Arguments.OfArgs
let command = args.ToWindowsCommandLine
Expect.equal command "create-release --project=MyProject --version=1234567890.12.34 --package=MyPackage:1234567890.12.34 --project=MyProject --deployto=MyEnvironment --version=1234567890.12.34 --progress --server=https://myoctopus-server.com --apikey=octoApiKey" "The output should be runnable on windows."
]
53 changes: 0 additions & 53 deletions src/test/Fake.Core.UnitTests/Fake.Tools.Testing.Octo.fs
View file
Open in desktop

This file was deleted.