diff --git a/README.md b/README.md index 791fd48f327b06b4b9064aaa1f6f467240ef678e..6444bdaa3618f907defa66fbdb11d9257de57939 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,11 @@ The CLI will default to using a rekor server connection of `localhost:3000`, sho The `add` command sends a file to the transparency log, who then adds the file to the transparency log as a merkle leaf. -`rekor-cli add --linkfile <your/yourfile>` +`rekor-cli add --rekord <your/yourfile>` ## Get Proof of Entry -`rekor-cli get --linkfile <your/yourfile>` +`rekor-cli get --rekord <your/yourfile>` The `get` command performs an inclusion proof request to the transparency log. Attributes such as the files merkle hash, signed tree root hash are used to diff --git a/cmd/add.go b/cmd/add.go index 34986f4cd2d2e1db445e436ffd69ab865f893a07..2ff1c03673993ad795400550910e0c05c5efbb4c 100644 --- a/cmd/add.go +++ b/cmd/add.go @@ -31,16 +31,16 @@ import ( var addCmd = &cobra.Command{ Use: "add", Short: "Rekor Add Command", - Long: `Add a linkfile to rekor + Long: `Add a rekord to rekor -The Add command will send a link file to rekor which will +The Add command will send a rekord file to rekor which will then hash the file into the transparency log`, Run: func(cmd *cobra.Command, args []string) { log := log.Logger rekorServer := viper.GetString("rekor_server") url := rekorServer + "/api/v1/add" - linkfile := viper.GetString("linkfile") + rekord := viper.GetString("rekord") // Set Context with Timeout for connects to thde log rpc server ctx, cancel := context.WithTimeout(context.Background(), 180*time.Second) @@ -48,7 +48,7 @@ then hash the file into the transparency log`, request, err := http.NewRequestWithContext(ctx, "POST", url, nil) - if err := addFileToRequest(request, linkfile); err != nil { + if err := addFileToRequest(request, rekord); err != nil { log.Fatal(err) } client := &http.Client{} diff --git a/cmd/get.go b/cmd/get.go index 40ab3b7134ac7cd666a48d197a27d1e814a30001..32c2a9509dfae94a32649e3396abd4a68ac54a37 100644 --- a/cmd/get.go +++ b/cmd/get.go @@ -54,7 +54,7 @@ exists within the transparency log`, log := log.Logger rekorServer := viper.GetString("rekor_server") url := rekorServer + "/api/v1/getproof" - linkfile := viper.GetString("linkfile") + rekord := viper.GetString("rekord") // Set Context with Timeout for connects to thde log rpc server ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) @@ -65,7 +65,7 @@ exists within the transparency log`, log.Fatal(err) } - if err := addFileToRequest(request, linkfile); err != nil { + if err := addFileToRequest(request, rekord); err != nil { log.Fatal(err) } @@ -92,7 +92,7 @@ exists within the transparency log`, log.Fatal(err) } - f, err := ioutil.ReadFile(linkfile) + f, err := ioutil.ReadFile(rekord) if err != nil { log.Fatal(err) } diff --git a/cmd/root.go b/cmd/root.go index 3838674992d721fa7f849302a5f5f3859912eae0..8cdeaaa6e5c5cf1b75c8ed58f1f16f6f547c8167 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -49,8 +49,8 @@ func init() { rootCmd.PersistentFlags().String("rekor_server", "http://localhost:3000", "Server address:port") viper.BindPFlag("rekor_server", rootCmd.PersistentFlags().Lookup("rekor_server")) - rootCmd.PersistentFlags().String("linkfile", "", "In-toto link file") - viper.BindPFlag("linkfile", rootCmd.PersistentFlags().Lookup("linkfile")) + rootCmd.PersistentFlags().String("rekord", "", "Rekor rekord file") + viper.BindPFlag("rekord", rootCmd.PersistentFlags().Lookup("rekord")) } func initConfig() { diff --git a/cmd/upload.go b/cmd/upload.go new file mode 100644 index 0000000000000000000000000000000000000000..22b9d50aa781fcbc60081c08d61707baf00a556b --- /dev/null +++ b/cmd/upload.go @@ -0,0 +1,53 @@ +/* +Copyright © 2020 NAME HERE <EMAIL ADDRESS> + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +package cmd + +import ( + "github.com/projectrekor/rekor-cli/log" + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +// uploadCmd represents the upload command +var uploadCmd = &cobra.Command{ + Use: "upload", + 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) { + log := log.Logger + rekorServer := viper.GetString("rekor_server") + url := rekorServer + "/api/v1/upload" + }, +} + +func init() { + rootCmd.AddCommand(uploadCmd) + + // Here you will define your flags and configuration settings. + + // Cobra supports Persistent Flags which will work for this command + // and all subcommands, e.g.: + // uploadCmd.PersistentFlags().String("foo", "", "A help for foo") + + // Cobra supports local flags which will only run when this command + // is called directly, e.g.: + // uploadCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +}