Skip to content

Commit

Permalink
fix: broken tests
Browse files Browse the repository at this point in the history
Signed-off-by: clok <github@clok.sh>
  • Loading branch information
clok committed Jan 11, 2024
1 parent c9e28d2 commit 9d64a59
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 77 deletions.
3 changes: 1 addition & 2 deletions cdocs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"runtime"
Expand Down Expand Up @@ -114,7 +113,7 @@ func InstallManpageCommand(opts *InstallManpageCommandInput) (*cli.Command, erro
mp, _ := ToMan(c.App)
manpath := filepath.Join(path, fmt.Sprintf("%s.8", name))
kman.Printf("generated man page path: %s", manpath)
err := ioutil.WriteFile(manpath, []byte(mp), 0644)
err := os.WriteFile(manpath, []byte(mp), 0644)
if err != nil {
return cli.Exit(fmt.Sprintf("Unable to install man page: %e", err), 2)
}
Expand Down
5 changes: 2 additions & 3 deletions cdocs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
"github.com/stretchr/testify/assert"
"github.com/urfave/cli/v2"
"io/ioutil"
"os"
"testing"
"time"
Expand Down Expand Up @@ -317,7 +316,7 @@ func Test_ToMarkdown(t *testing.T) {

res, err := ToMarkdown(app)

data, _ := ioutil.ReadFile("data/test.md")
data, _ := os.ReadFile("data/test.md")

is.Nil(err)
is.Equal(res, string(data))
Expand All @@ -330,7 +329,7 @@ func Test_ToMan(t *testing.T) {

res, err := ToMan(app)

data, _ := ioutil.ReadFile("data/test.man")
data, _ := os.ReadFile("data/test.man")

is.Nil(err)
is.Equal(res, string(data))
Expand Down
128 changes: 56 additions & 72 deletions data/test.man
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
.nh
.TH test\-app 8
.TH test-app 8

.SH NAME
.PP
test\-app \- interact with config map and secret manager variables
test-app - interact with config map and secret manager variables


.SH SYNOPSIS
.PP
test\-app
test-app


.SH COMMAND TREE
.RS
.IP \(bu 2
env, e
\[la]#env-e\[ra]
\[la]#env\-e\[ra]
.RS
.IP \(bu 2
diff, d
\[la]#diff-d\[ra]
\[la]#diff\-d\[ra]
.RS
.IP \(bu 2
namespace, ns
\[la]#namespace-ns\[ra]
\[la]#namespace\-ns\[ra]
.IP \(bu 2
ansible, legacy
\[la]#ansible-legacy\[ra]
\[la]#ansible\-legacy\[ra]

.RE

.IP \(bu 2
view, v
\[la]#view-v\[ra]
\[la]#view\-v\[ra]
.RS
.IP \(bu 2
configmap, c
\[la]#configmap-c\[ra]
\[la]#configmap\-c\[ra]
.IP \(bu 2
ansible, legacy
\[la]#ansible-legacy\[ra]
\[la]#ansible\-legacy\[ra]
.IP \(bu 2
namespace, ns
\[la]#namespace-ns\[ra]
\[la]#namespace\-ns\[ra]

.RE

Expand All @@ -61,21 +61,17 @@ get

.IP \(bu 2
version, v
\[la]#version-v\[ra]
\[la]#version\-v\[ra]

.RE

.PP
\fBUsage\fP:

.PP
.RS
.EX
test-app [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]
.nf
test\-app [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]

.fi
.RE
.EE


.SH COMMANDS
Expand All @@ -91,21 +87,18 @@ Print out detailed diff reports comparing local and running Pod
.PP
View diff of local vs. namespace

.PP
.RS

.nf
View the diff of the local ansible\-vault encrypted Kubenetes Secret file
.EX
View the diff of the local ansible-vault encrypted Kubenetes Secret file
against a given dotenv file on a pod within a namespace.
The local file will use the contents of the 'data.<accsessor flag>' block.
This defaults to 'data..env'.
Supported ansible\-vault encryption version: $ANSIBLE\_VAULT;1.1;AES256
Supported ansible-vault encryption version: $ANSIBLE_VAULT;1.1;AES256
Example file structure of decrypted file:
\-\-\-
---
apiVersion: v1
kind: Secret
type: Opaque
Expand All @@ -115,51 +108,47 @@ data:
It will then grab contents of the dotenv filr on a Pod in a given Namespace.
This defaults to inspecting the '$PWD/.env on' when executing a 'cat' command.
This method uses '/bin/bash \-c' as the base command to perform inspection.
This method uses '/bin/bash -c' as the base command to perform inspection.
.fi
.RE
.EE

.PP
\fB\-\-cmd\fP="": Command to inspect (default: node)
\fB--cmd\fP="": Command to inspect (default: node)

.PP
\fB\-\-configmap, \-c\fP="": Path to configmap.yaml
\fB--configmap, -c\fP="": Path to configmap.yaml

.PP
\fB\-\-exclude\fP="": List (csv) of specific env vars to exclude values from display. Set to \fB\fC""\fR to remove any exclusions. (default: PATH,SHLVL,HOSTNAME)
\fB--exclude\fP="": List (csv) of specific env vars to exclude values from display. Set to \fB""\fR to remove any exclusions. (default: PATH,SHLVL,HOSTNAME)

.PP
\fB\-\-filter\-prefix, \-f\fP="": List of prefixes (csv) used to filter values from display. Set to \fB\fC""\fR to remove any filters. (default: npm\fI,KUBERNETES\fP,API\_PORT)
\fB--filter-prefix, -f\fP="": List of prefixes (csv) used to filter values from display. Set to \fB""\fR to remove any filters. (default: npm\fI,KUBERNETES\fP,API_PORT)

.PP
\fB\-\-namespace, \-n\fP="": Kube Namespace to list Pods from for inspection
\fB--namespace, -n\fP="": Kube Namespace to list Pods from for inspection

.PP
\fB\-\-secret\-suffix\fP="": Suffix used to find ENV variables that denote the Secret Manager Secrets to lookup (default: \_NAME)
\fB--secret-suffix\fP="": Suffix used to find ENV variables that denote the Secret Manager Secrets to lookup (default: _NAME)

.PP
\fB\-\-secrets, \-s\fP="": Path to secrets.yml (default: .docker/secrets.yml)
\fB--secrets, -s\fP="": Path to secrets.yml (default: .docker/secrets.yml)

.SS ansible, legacy
.PP
View diff of local (ansible encrypted) vs. namespace

.PP
.RS

.nf
View the diff of the local ansible\-vault encrypted Kubenetes Secret file
.EX
View the diff of the local ansible-vault encrypted Kubenetes Secret file
against a given dotenv file on a pod within a namespace.
The local file will use the contents of the 'data.<accsessor flag>' block.
This defaults to 'data..env'.
Supported ansible\-vault encryption version: $ANSIBLE\_VAULT;1.1;AES256
Supported ansible-vault encryption version: $ANSIBLE_VAULT;1.1;AES256
Example file structure of decrypted file:
\-\-\-
---
apiVersion: v1
kind: Secret
type: Opaque
Expand All @@ -169,25 +158,24 @@ data:
It will then grab contents of the dotenv filr on a Pod in a given Namespace.
This defaults to inspecting the '$PWD/.env on' when executing a 'cat' command.
This method uses '/bin/bash \-c' as the base command to perform inspection.
This method uses '/bin/bash -c' as the base command to perform inspection.
.fi
.RE
.EE

.PP
\fB\-\-accessor, \-a\fP="": Accessor key to pull data out of Data block. (default: .env)
\fB--accessor, -a\fP="": Accessor key to pull data out of Data block. (default: .env)

.PP
\fB\-\-dotenv\fP="": Path to \fB\fC\&.env\fR file on Pod (default: $PWD/.env)
\fB--dotenv\fP="": Path to \fB\&.env\fR file on Pod (default: $PWD/.env)

.PP
\fB\-\-encrypted\-env\-file, \-e\fP="": Path to encrypted Kube Secret file
\fB--encrypted-env-file, -e\fP="": Path to encrypted Kube Secret file

.PP
\fB\-\-namespace, \-n\fP="": Kube Namespace list Pods from for inspection
\fB--namespace, -n\fP="": Kube Namespace list Pods from for inspection

.PP
\fB\-\-vault\-password\-file\fP="": vault password file \fB\fCVAULT\_PASSWORD\_FILE\fR
\fB--vault-password-file\fP="": vault password file \fBVAULT_PASSWORD_FILE\fR

.SS view, v
.PP
Expand All @@ -206,17 +194,17 @@ A single line of UsageText
.RE

.PP
\fB\-\-configmap, \-c\fP="": Path to configmap.yaml
\fB--configmap, -c\fP="": Path to configmap.yaml

.PP
\fB\-\-secret\-suffix\fP="": Suffix used to find ENV variables that denote the Secret Manager Secrets to lookup (default: \_NAME)
\fB--secret-suffix\fP="": Suffix used to find ENV variables that denote the Secret Manager Secrets to lookup (default: _NAME)

.PP
\fB\-\-secrets, \-s\fP="": Path to secrets.yml (default: .docker/secrets.yml)
\fB--secrets, -s\fP="": Path to secrets.yml (default: .docker/secrets.yml)

.SS ansible, legacy
.PP
View env values from ansible\-vault encrypted Secret file.
View env values from ansible-vault encrypted Secret file.

.PP
.RS
Expand All @@ -227,33 +215,30 @@ A single line of UsageText
.RE

.PP
\fB\-\-accessor, \-a\fP="": Accessor key to pull data out of Data block. (default: .env)
\fB--accessor, -a\fP="": Accessor key to pull data out of Data block. (default: .env)

.PP
\fB\-\-encrypted\-env\-file, \-e\fP="": Path to encrypted Kube Secret file
\fB--encrypted-env-file, -e\fP="": Path to encrypted Kube Secret file

.PP
\fB\-\-vault\-password\-file\fP="": vault password file \fB\fCVAULT\_PASSWORD\_FILE\fR
\fB--vault-password-file\fP="": vault password file \fBVAULT_PASSWORD_FILE\fR

.SS namespace, ns
.PP
Interact with env on a running Pod within a Namespace

.PP
.RS

.nf
View the diff of the local ansible\-vault encrypted Kubenetes Secret file
.EX
View the diff of the local ansible-vault encrypted Kubenetes Secret file
against a given dotenv file on a pod within a namespace.
The local file will use the contents of the 'data.<accsessor flag>' block.
This defaults to 'data..env'.
Supported ansible\-vault encryption version: $ANSIBLE\_VAULT;1.1;AES256
Supported ansible-vault encryption version: $ANSIBLE_VAULT;1.1;AES256
Example file structure of decrypted file:
\-\-\-
---
apiVersion: v1
kind: Secret
type: Opaque
Expand All @@ -263,22 +248,21 @@ data:
It will then grab contents of the dotenv filr on a Pod in a given Namespace.
This defaults to inspecting the '$PWD/.env on' when executing a 'cat' command.
This method uses '/bin/bash \-c' as the base command to perform inspection.
This method uses '/bin/bash -c' as the base command to perform inspection.
.fi
.RE
.EE

.PP
\fB\-\-cmd\fP="": Command to inspect (default: node)
\fB--cmd\fP="": Command to inspect (default: node)

.PP
\fB\-\-exclude\fP="": List (csv) of specific env vars to exclude values from display. Set to \fB\fC""\fR to remove any exclusions. (default: PATH,SHLVL,HOSTNAME)
\fB--exclude\fP="": List (csv) of specific env vars to exclude values from display. Set to \fB""\fR to remove any exclusions. (default: PATH,SHLVL,HOSTNAME)

.PP
\fB\-\-filter\-prefix, \-f\fP="": List of prefixes (csv) used to filter values from display. Set to \fB\fC""\fR to remove any filters. (default: npm\fI,KUBERNETES\fP,API\_PORT)
\fB--filter-prefix, -f\fP="": List of prefixes (csv) used to filter values from display. Set to \fB""\fR to remove any filters. (default: npm\fI,KUBERNETES\fP,API_PORT)

.PP
\fB\-\-namespace, \-n\fP="": Kube Namespace list Pods from
\fB--namespace, -n\fP="": Kube Namespace list Pods from

.SH s3
.PP
Expand Down

0 comments on commit 9d64a59

Please sign in to comment.