-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
create list/validate/generate commands
- Loading branch information
1 parent
19c689b
commit 5c9ffdb
Showing
7 changed files
with
344 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| Copyright © 2023 SKIP, Kartverket <william.andersson@kartverket.no> | ||
| 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. | ||
| */ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| "regexp" | ||
|
|
||
| skiperator "github.com/kartverket/skiperator/api/v1alpha1" | ||
| "github.com/kartverket/skipper/pkg/util" | ||
| "github.com/manifoldco/promptui" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| // generateCmd represents the generate command | ||
| var generateCmd = &cobra.Command{ | ||
| Use: "generate", | ||
| Short: "A brief description of your command", | ||
| Long: `A longer description that spans multiple lines and likely contains examples | ||
| and usage of using your command. For example: | ||
| Cobra is a CLI library for Go that empowers applications. | ||
| This application is a tool to generate the needed files | ||
| to quickly create a Cobra application.`, | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
|
|
||
| // TODO Actually do something with errors | ||
|
|
||
| application := skiperator.Application{} | ||
| application.FillDefaultsSpec() | ||
| application.FillDefaultsStatus() | ||
|
|
||
| appName, err := promptStringWithRegexValidator("^[a-z]+(-[a-z]+)*$", "Application Name") | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| appNamespace, err := promptStringWithRegexValidator("^[a-z]+(-[a-z]+)*$", "Application Namespace") | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| application.Name = appName | ||
| application.Namespace = appNamespace | ||
|
|
||
| shouldWrite, err := promptYesNoSelect("Write Application to file?") | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| if shouldWrite { | ||
| filename, err := promptStringWithRegexValidator(`^\w+$`, "Filename (.yaml added automatically)") | ||
| if err != nil { | ||
| return | ||
| } | ||
| util.WriteApplicationToFile(filename, application) | ||
| } else { | ||
| appJson, _ := json.MarshalIndent(application, "", "\t") | ||
|
|
||
| println(appJson) | ||
| } | ||
|
|
||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| skipAppCmd.AddCommand(generateCmd) | ||
| } | ||
|
|
||
| func promptStringWithRegexValidator(regex string, label string) (string, error) { | ||
| validateWithRegex := func(input string) error { | ||
| match, _ := regexp.MatchString(regex, input) | ||
| if !match { | ||
| errorMessage := fmt.Sprintf("%s must follow regex: %s", label, regex) | ||
| err := errors.New(errorMessage) | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| prompt := promptui.Prompt{ | ||
| Label: label, | ||
| Validate: validateWithRegex, | ||
| } | ||
|
|
||
| return prompt.Run() | ||
| } | ||
|
|
||
| func promptYesNoSelect(label string) (bool, error) { | ||
| prompt := promptui.Select{ | ||
| Label: label, | ||
| Items: []string{"Yes", "No"}, | ||
| } | ||
|
|
||
| responseToBoolMap := map[string]bool{ | ||
| "Yes": true, | ||
| "No": false, | ||
| } | ||
|
|
||
| _, response, err := prompt.Run() | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| return responseToBoolMap[response], nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| Copyright © 2023 SKIP, Kartverket <william.andersson@kartverket.no> | ||
| 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. | ||
| */ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| // skipAppCmd represents the skipApp command | ||
| var skipAppCmd = &cobra.Command{ | ||
| Use: "skip-app", | ||
| Example: "skip-app list --namespace a-namespace", | ||
| Args: cobra.ExactArgs(0), | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| fmt.Println("It seems you did not give any arguments to skip-app. Please see skipper skip-app --help for more") | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| rootCmd.AddCommand(skipAppCmd) | ||
|
|
||
| // Here you will define your flags and configuration settings. | ||
|
|
||
| // Cobra supports Persistent Flags which will work for this command | ||
| // and all subcommands, e.g.: | ||
| // skipAppCmd.PersistentFlags().String("foo", "", "A help for foo") | ||
|
|
||
| // Cobra supports local flags which will only run when this command | ||
| // is called directly, e.g.: | ||
| // skipAppCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| Copyright © 2023 SKIP, Kartverket <william.andersson@kartverket.no> | ||
| 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. | ||
| */ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/spf13/cobra" | ||
|
|
||
| util "github.com/kartverket/skipper/pkg/util" | ||
| ) | ||
|
|
||
| // validateCmd represents the validate command | ||
| var validateCmd = &cobra.Command{ | ||
| Use: "validate", | ||
| Short: "Validates a .yaml file as an Application and returns the resulting Application as a file.", | ||
| Long: `Validates a SKIP application by taking in the path to an Application in .yaml form. | ||
| In addition the command writes the resulting Application to a new file, with | ||
| added default values`, | ||
| Args: cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs), | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| filePath := args[0] | ||
|
|
||
| application, err := util.ReadApplicationFromFile(filePath) | ||
|
|
||
| if err != nil { | ||
| fmt.Println("Your application was not formatted correctly. Error: %v" + err.Error()) | ||
| return | ||
| } | ||
|
|
||
| application.FillDefaultsSpec() | ||
| application.FillDefaultsStatus() | ||
|
|
||
| util.WriteApplicationToFile("test", application) | ||
|
|
||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| skipAppCmd.AddCommand(validateCmd) | ||
|
|
||
| // Here you will define your flags and configuration settings. | ||
|
|
||
| // Cobra supports Persistent Flags which will work for this command | ||
| // and all subcommands, e.g.: | ||
| // validateCmd.PersistentFlags().String("foo", "", "A help for foo") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.