From 40b9fe9b854ca90ed55e13c8fe74e13a506b76d1 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Tue, 26 Sep 2023 00:29:10 +0700 Subject: testdata: rename "encrypt" to "local" We change the directory name because the "encrpyt" is not specific to encryption only but only for local. --- .gitignore | 3 +-- awwan_test.go | 6 +++--- testdata/encrypt/.awwan.env.plain | 2 -- testdata/encrypt/.awwan.env.vault | Bin 384 -> 0 bytes testdata/encrypt/.awwan.key | 1 - testdata/encrypt/.ssh/empty | 0 testdata/encrypt/awwan.env | 2 -- testdata/encrypt/encrypted.txt.org | 2 -- testdata/encrypt/encrypted.txt.vault | 2 -- testdata/encrypt/local.aww | 5 ----- testdata/encrypt/plain.txt | 2 -- testdata/encrypt/sub/.awwan.env.plain | 2 -- testdata/encrypt/sub/.awwan.env.vault | Bin 384 -> 0 bytes testdata/encrypt/sub/local.aww | 1 - testdata/encrypt/test.data | 17 ----------------- testdata/encrypt/tmp/.gitignore | 2 -- testdata/local/.awwan.env.plain | 2 ++ testdata/local/.awwan.env.vault | Bin 0 -> 384 bytes testdata/local/.awwan.key | 1 + testdata/local/.ssh/empty | 0 testdata/local/awwan.env | 2 ++ testdata/local/encrypted.txt.org | 2 ++ testdata/local/encrypted.txt.vault | 2 ++ testdata/local/local.aww | 5 +++++ testdata/local/plain.txt | 2 ++ testdata/local/sub/.awwan.env.plain | 2 ++ testdata/local/sub/.awwan.env.vault | Bin 0 -> 384 bytes testdata/local/sub/local.aww | 1 + testdata/local/test.data | 17 +++++++++++++++++ testdata/local/tmp/.gitignore | 2 ++ 30 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 testdata/encrypt/.awwan.env.plain delete mode 100644 testdata/encrypt/.awwan.env.vault delete mode 120000 testdata/encrypt/.awwan.key delete mode 100644 testdata/encrypt/.ssh/empty delete mode 100644 testdata/encrypt/awwan.env delete mode 100644 testdata/encrypt/encrypted.txt.org delete mode 100644 testdata/encrypt/encrypted.txt.vault delete mode 100644 testdata/encrypt/local.aww delete mode 100644 testdata/encrypt/plain.txt delete mode 100644 testdata/encrypt/sub/.awwan.env.plain delete mode 100644 testdata/encrypt/sub/.awwan.env.vault delete mode 100644 testdata/encrypt/sub/local.aww delete mode 100644 testdata/encrypt/test.data delete mode 100644 testdata/encrypt/tmp/.gitignore create mode 100644 testdata/local/.awwan.env.plain create mode 100644 testdata/local/.awwan.env.vault create mode 120000 testdata/local/.awwan.key create mode 100644 testdata/local/.ssh/empty create mode 100644 testdata/local/awwan.env create mode 100644 testdata/local/encrypted.txt.org create mode 100644 testdata/local/encrypted.txt.vault create mode 100644 testdata/local/local.aww create mode 100644 testdata/local/plain.txt create mode 100644 testdata/local/sub/.awwan.env.plain create mode 100644 testdata/local/sub/.awwan.env.vault create mode 100644 testdata/local/sub/local.aww create mode 100644 testdata/local/test.data create mode 100644 testdata/local/tmp/.gitignore diff --git a/.gitignore b/.gitignore index 85920b1..6cef159 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,4 @@ /testdata/decrypt-with-passphrase/.awwan.env /testdata/encrypt-with-passphrase/.awwan.env.vault /testdata/encrypt-without-passphrase/.awwan.env.vault -/testdata/encrypt/.cache -/testdata/encrypt/file.txt.decrypted +/testdata/local/.cache diff --git a/awwan_test.go b/awwan_test.go index 77e64ec..349072b 100644 --- a/awwan_test.go +++ b/awwan_test.go @@ -163,13 +163,13 @@ func TestAwwanLocal_withEncryption(t *testing.T) { err error ) - tdata, err = test.LoadData(`testdata/encrypt/test.data`) + tdata, err = test.LoadData(`testdata/local/test.data`) if err != nil { t.Fatal(err) } var ( - basedir = filepath.Join(`testdata`, `encrypt`) + basedir = filepath.Join(`testdata`, `local`) mockout = bytes.Buffer{} mockerr = bytes.Buffer{} mockrw = mock.ReadWriter{} @@ -227,7 +227,7 @@ func TestAwwanLocalPut(t *testing.T) { // Load the test data output. var ( - baseDir = filepath.Join(`testdata`, `encrypt`) + baseDir = filepath.Join(`testdata`, `local`) tdata *test.Data err error diff --git a/testdata/encrypt/.awwan.env.plain b/testdata/encrypt/.awwan.env.plain deleted file mode 100644 index 26ed285..0000000 --- a/testdata/encrypt/.awwan.env.plain +++ /dev/null @@ -1,2 +0,0 @@ -[secret] -pass = this_is_a_secret diff --git a/testdata/encrypt/.awwan.env.vault b/testdata/encrypt/.awwan.env.vault deleted file mode 100644 index a4e4bdd..0000000 Binary files a/testdata/encrypt/.awwan.env.vault and /dev/null differ diff --git a/testdata/encrypt/.awwan.key b/testdata/encrypt/.awwan.key deleted file mode 120000 index aa99eff..0000000 --- a/testdata/encrypt/.awwan.key +++ /dev/null @@ -1 +0,0 @@ -../encrypt-with-passphrase/.awwan.key \ No newline at end of file diff --git a/testdata/encrypt/.ssh/empty b/testdata/encrypt/.ssh/empty deleted file mode 100644 index e69de29..0000000 diff --git a/testdata/encrypt/awwan.env b/testdata/encrypt/awwan.env deleted file mode 100644 index 81b55e7..0000000 --- a/testdata/encrypt/awwan.env +++ /dev/null @@ -1,2 +0,0 @@ -[host] -name = encrypt diff --git a/testdata/encrypt/encrypted.txt.org b/testdata/encrypt/encrypted.txt.org deleted file mode 100644 index de6797e..0000000 --- a/testdata/encrypt/encrypted.txt.org +++ /dev/null @@ -1,2 +0,0 @@ -The host name is {{.Val "host::name"}}. -The secret password is {{.Val "secret::pass"}}. diff --git a/testdata/encrypt/encrypted.txt.vault b/testdata/encrypt/encrypted.txt.vault deleted file mode 100644 index 43cb223..0000000 --- a/testdata/encrypt/encrypted.txt.vault +++ /dev/null @@ -1,2 +0,0 @@ -E{ -;_%uۂK?C5+BclP8"b5mD B!PA\`2TW, d<.$V-{S3UTָgjj@*qAXBb42$TTnX@OKwa$}j|Hʹ#Ma15m1M!+(,k:ctsB0l7P췧o6J'i;_6zVijS m2D?&73'yf=T&aj~A#!Qu@ Jc?qcp9 (&,ʑoN1BTNN|YG%Xt \ No newline at end of file diff --git a/testdata/encrypt/local.aww b/testdata/encrypt/local.aww deleted file mode 100644 index a77ec42..0000000 --- a/testdata/encrypt/local.aww +++ /dev/null @@ -1,5 +0,0 @@ -echo {{.Val "secret::pass"}} - -#put: {{.ScriptDir}}/plain.txt {{.ScriptDir}}/tmp/plain.txt - -#put: {{.ScriptDir}}/encrypted.txt {{.ScriptDir}}/tmp/decrypted.txt diff --git a/testdata/encrypt/plain.txt b/testdata/encrypt/plain.txt deleted file mode 100644 index de6797e..0000000 --- a/testdata/encrypt/plain.txt +++ /dev/null @@ -1,2 +0,0 @@ -The host name is {{.Val "host::name"}}. -The secret password is {{.Val "secret::pass"}}. diff --git a/testdata/encrypt/sub/.awwan.env.plain b/testdata/encrypt/sub/.awwan.env.plain deleted file mode 100644 index 02b2ae0..0000000 --- a/testdata/encrypt/sub/.awwan.env.plain +++ /dev/null @@ -1,2 +0,0 @@ -[secret] -pass = this_is_a_secret_in_sub diff --git a/testdata/encrypt/sub/.awwan.env.vault b/testdata/encrypt/sub/.awwan.env.vault deleted file mode 100644 index 21aa5b1..0000000 Binary files a/testdata/encrypt/sub/.awwan.env.vault and /dev/null differ diff --git a/testdata/encrypt/sub/local.aww b/testdata/encrypt/sub/local.aww deleted file mode 100644 index d9127db..0000000 --- a/testdata/encrypt/sub/local.aww +++ /dev/null @@ -1 +0,0 @@ -echo {{.Val "secret::pass"}} diff --git a/testdata/encrypt/test.data b/testdata/encrypt/test.data deleted file mode 100644 index 330e646..0000000 --- a/testdata/encrypt/test.data +++ /dev/null @@ -1,17 +0,0 @@ -<<< local.aww:1 - ---> local: 1: echo this_is_a_secret -this_is_a_secret - -<<< sub/local.aww:1 - ---> local: 1: echo this_is_a_secret_in_sub -this_is_a_secret_in_sub - -<<< tmp/plain.txt -The host name is encrypt. -The secret password is . - -<<< tmp/decrypted.txt -The host name is encrypt. -The secret password is this_is_a_secret. diff --git a/testdata/encrypt/tmp/.gitignore b/testdata/encrypt/tmp/.gitignore deleted file mode 100644 index 120f485..0000000 --- a/testdata/encrypt/tmp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!/.gitignore diff --git a/testdata/local/.awwan.env.plain b/testdata/local/.awwan.env.plain new file mode 100644 index 0000000..26ed285 --- /dev/null +++ b/testdata/local/.awwan.env.plain @@ -0,0 +1,2 @@ +[secret] +pass = this_is_a_secret diff --git a/testdata/local/.awwan.env.vault b/testdata/local/.awwan.env.vault new file mode 100644 index 0000000..a4e4bdd Binary files /dev/null and b/testdata/local/.awwan.env.vault differ diff --git a/testdata/local/.awwan.key b/testdata/local/.awwan.key new file mode 120000 index 0000000..aa99eff --- /dev/null +++ b/testdata/local/.awwan.key @@ -0,0 +1 @@ +../encrypt-with-passphrase/.awwan.key \ No newline at end of file diff --git a/testdata/local/.ssh/empty b/testdata/local/.ssh/empty new file mode 100644 index 0000000..e69de29 diff --git a/testdata/local/awwan.env b/testdata/local/awwan.env new file mode 100644 index 0000000..81b55e7 --- /dev/null +++ b/testdata/local/awwan.env @@ -0,0 +1,2 @@ +[host] +name = encrypt diff --git a/testdata/local/encrypted.txt.org b/testdata/local/encrypted.txt.org new file mode 100644 index 0000000..de6797e --- /dev/null +++ b/testdata/local/encrypted.txt.org @@ -0,0 +1,2 @@ +The host name is {{.Val "host::name"}}. +The secret password is {{.Val "secret::pass"}}. diff --git a/testdata/local/encrypted.txt.vault b/testdata/local/encrypted.txt.vault new file mode 100644 index 0000000..43cb223 --- /dev/null +++ b/testdata/local/encrypted.txt.vault @@ -0,0 +1,2 @@ +E{ +;_%uۂK?C5+BclP8"b5mD B!PA\`2TW, d<.$V-{S3UTָgjj@*qAXBb42$TTnX@OKwa$}j|Hʹ#Ma15m1M!+(,k:ctsB0l7P췧o6J'i;_6zVijS m2D?&73'yf=T&aj~A#!Qu@ Jc?qcp9 (&,ʑoN1BTNN|YG%Xt \ No newline at end of file diff --git a/testdata/local/local.aww b/testdata/local/local.aww new file mode 100644 index 0000000..a77ec42 --- /dev/null +++ b/testdata/local/local.aww @@ -0,0 +1,5 @@ +echo {{.Val "secret::pass"}} + +#put: {{.ScriptDir}}/plain.txt {{.ScriptDir}}/tmp/plain.txt + +#put: {{.ScriptDir}}/encrypted.txt {{.ScriptDir}}/tmp/decrypted.txt diff --git a/testdata/local/plain.txt b/testdata/local/plain.txt new file mode 100644 index 0000000..de6797e --- /dev/null +++ b/testdata/local/plain.txt @@ -0,0 +1,2 @@ +The host name is {{.Val "host::name"}}. +The secret password is {{.Val "secret::pass"}}. diff --git a/testdata/local/sub/.awwan.env.plain b/testdata/local/sub/.awwan.env.plain new file mode 100644 index 0000000..02b2ae0 --- /dev/null +++ b/testdata/local/sub/.awwan.env.plain @@ -0,0 +1,2 @@ +[secret] +pass = this_is_a_secret_in_sub diff --git a/testdata/local/sub/.awwan.env.vault b/testdata/local/sub/.awwan.env.vault new file mode 100644 index 0000000..21aa5b1 Binary files /dev/null and b/testdata/local/sub/.awwan.env.vault differ diff --git a/testdata/local/sub/local.aww b/testdata/local/sub/local.aww new file mode 100644 index 0000000..d9127db --- /dev/null +++ b/testdata/local/sub/local.aww @@ -0,0 +1 @@ +echo {{.Val "secret::pass"}} diff --git a/testdata/local/test.data b/testdata/local/test.data new file mode 100644 index 0000000..330e646 --- /dev/null +++ b/testdata/local/test.data @@ -0,0 +1,17 @@ +<<< local.aww:1 + +--> local: 1: echo this_is_a_secret +this_is_a_secret + +<<< sub/local.aww:1 + +--> local: 1: echo this_is_a_secret_in_sub +this_is_a_secret_in_sub + +<<< tmp/plain.txt +The host name is encrypt. +The secret password is . + +<<< tmp/decrypted.txt +The host name is encrypt. +The secret password is this_is_a_secret. diff --git a/testdata/local/tmp/.gitignore b/testdata/local/tmp/.gitignore new file mode 100644 index 0000000..120f485 --- /dev/null +++ b/testdata/local/tmp/.gitignore @@ -0,0 +1,2 @@ +* +!/.gitignore -- cgit v1.3