forked from istio/pkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add probe cobra command mixer, galley and security(istio_ca) have `probe` sub-command and their codes are duplicated. This patch adds probe cobra command to be commonly used. * Fix review comments: * Add the func Validate() to produce proper error. * Add the Example. * Add the LongDesc to understand the option more easily. * Add the comment for CobraCommand for probe. * Add copyright banner * Fix typo
- Loading branch information
Showing
4 changed files
with
161 additions
and
1 deletion.
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,62 @@ | ||
// Copyright 2020 Istio Authors | ||
// | ||
// 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 probe | ||
|
||
import ( | ||
"fmt" | ||
|
||
"github.com/spf13/cobra" | ||
) | ||
|
||
var ( | ||
probeLongDesc = `Check the liveness or readiness of a locally-running server | ||
Check if the target file is older than the interval. The locally-running server updates the last modified time | ||
(you need to enable it on server side), so probe command compares it with current time.` | ||
|
||
probeExample = ` | ||
# Check if the target file '/health' is older than interval of 4 seconds | ||
probe --probe-path=/health --interval=4s` | ||
) | ||
|
||
// CobraCommand returns a command used to probe liveness or readiness of a locally-running server | ||
// by checking the last modified time of target file. | ||
func CobraCommand() *cobra.Command { | ||
var probeOptions Options | ||
|
||
prb := &cobra.Command{ | ||
Use: "probe", | ||
Short: "Check the liveness or readiness of a locally-running server", | ||
Long: probeLongDesc, | ||
Args: cobra.ExactArgs(0), | ||
Example: probeExample, | ||
RunE: func(cmd *cobra.Command, _ []string) error { | ||
if err := probeOptions.Validate(); err != nil { | ||
return err | ||
} | ||
if err := NewFileClient(&probeOptions).GetStatus(); err != nil { | ||
return fmt.Errorf("fail on inspecting path %s: %v", probeOptions.Path, err) | ||
} | ||
fmt.Fprintf(cmd.OutOrStdout(), "OK") | ||
return nil | ||
}, | ||
} | ||
prb.PersistentFlags().StringVar(&probeOptions.Path, "probe-path", "", | ||
"Path of the file for checking the last modified time.") | ||
prb.PersistentFlags().DurationVar(&probeOptions.UpdateInterval, "interval", 0, | ||
"Duration used for checking the target file's last modified time.") | ||
|
||
return prb | ||
} |
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 2020 Istio Authors | ||
|
||
// 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 probe | ||
|
||
import ( | ||
"fmt" | ||
"io/ioutil" | ||
"os" | ||
"strings" | ||
"testing" | ||
) | ||
|
||
func TestOpts(t *testing.T) { | ||
fp, err := ioutil.TempFile(os.TempDir(), t.Name()) | ||
if err != nil { | ||
t.Fatalf("failed to create temp file") | ||
} | ||
cases := []struct { | ||
args string | ||
expectFail bool | ||
}{ | ||
{ | ||
"probe", | ||
true, | ||
}, | ||
{ | ||
"extra-args", | ||
true, | ||
}, | ||
{ | ||
fmt.Sprintf("--probe-path=%s.invalid --interval=1s", fp.Name()), | ||
true, | ||
}, | ||
{ | ||
fmt.Sprintf("--probe-path=%s --interval=1s", fp.Name()), | ||
false, | ||
}, | ||
} | ||
|
||
for _, v := range cases { | ||
t.Run(v.args, func(t *testing.T) { | ||
cmd := CobraCommand() | ||
cmd.SetArgs(strings.Split(v.args, " ")) | ||
err := cmd.Execute() | ||
|
||
if !v.expectFail && err != nil { | ||
t.Errorf("Got %v, expecting success", err) | ||
} | ||
if v.expectFail && err == nil { | ||
t.Errorf("Expected failure, got success") | ||
} | ||
}) | ||
} | ||
} |
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