From acbeea98008afabc43385641a14ee751a6ad0519 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 19 Jun 2020 15:45:58 -0400 Subject: [PATCH] option: add a Text-based presenter Signed-off-by: Alfredo Deza --- imgbom/presenter/option.go | 5 ++++ .../test-fixtures/image-simple/Dockerfile | 4 +++ .../test-fixtures/image-simple/file-1.txt | 1 + .../test-fixtures/image-simple/file-2.txt | 1 + .../snapshot/TestTextPresenter.golden | 28 +++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 imgbom/presenter/text/test-fixtures/image-simple/Dockerfile create mode 100644 imgbom/presenter/text/test-fixtures/image-simple/file-1.txt create mode 100644 imgbom/presenter/text/test-fixtures/image-simple/file-2.txt create mode 100644 imgbom/presenter/text/test-fixtures/snapshot/TestTextPresenter.golden diff --git a/imgbom/presenter/option.go b/imgbom/presenter/option.go index 354e84754..91f628fc1 100644 --- a/imgbom/presenter/option.go +++ b/imgbom/presenter/option.go @@ -5,15 +5,18 @@ import "strings" const ( UnknownPresenter Option = iota JSONPresenter + TextPresenter ) var optionStr = []string{ "UnknownPresenter", "json", + "text", } var Options = []Option{ JSONPresenter, + TextPresenter, } type Option int @@ -22,6 +25,8 @@ func ParseOption(userStr string) Option { switch strings.ToLower(userStr) { case strings.ToLower(JSONPresenter.String()): return JSONPresenter + case strings.ToLower(TextPresenter.String()): + return TextPresenter default: return UnknownPresenter } diff --git a/imgbom/presenter/text/test-fixtures/image-simple/Dockerfile b/imgbom/presenter/text/test-fixtures/image-simple/Dockerfile new file mode 100644 index 000000000..79cfa759e --- /dev/null +++ b/imgbom/presenter/text/test-fixtures/image-simple/Dockerfile @@ -0,0 +1,4 @@ +# Note: changes to this file will result in updating several test values. Consider making a new image fixture instead of editing this one. +FROM scratch +ADD file-1.txt /somefile-1.txt +ADD file-2.txt /somefile-2.txt diff --git a/imgbom/presenter/text/test-fixtures/image-simple/file-1.txt b/imgbom/presenter/text/test-fixtures/image-simple/file-1.txt new file mode 100644 index 000000000..985d3408e --- /dev/null +++ b/imgbom/presenter/text/test-fixtures/image-simple/file-1.txt @@ -0,0 +1 @@ +this file has contents \ No newline at end of file diff --git a/imgbom/presenter/text/test-fixtures/image-simple/file-2.txt b/imgbom/presenter/text/test-fixtures/image-simple/file-2.txt new file mode 100644 index 000000000..396d08bbc --- /dev/null +++ b/imgbom/presenter/text/test-fixtures/image-simple/file-2.txt @@ -0,0 +1 @@ +file-2 contents! \ No newline at end of file diff --git a/imgbom/presenter/text/test-fixtures/snapshot/TestTextPresenter.golden b/imgbom/presenter/text/test-fixtures/snapshot/TestTextPresenter.golden new file mode 100644 index 000000000..fbd9bb26b --- /dev/null +++ b/imgbom/presenter/text/test-fixtures/snapshot/TestTextPresenter.golden @@ -0,0 +1,28 @@ +[Image] + Layer: 0 + Digest: sha256:056c0789fa9ad629ceae6d09713fb035f84115af3c4a88a43aa60f13bc683053 + Size: 22 + MediaType: application/vnd.docker.image.rootfs.diff.tar.gzip + + Layer: 1 + Digest: sha256:b461c48116592c570a66fed71d5b09662a8172e168b7938cf317af47872cdc9b + Size: 16 + MediaType: application/vnd.docker.image.rootfs.diff.tar.gzip + + Layer: 2 + Digest: sha256:00b80053e05c01da485015610d288ce3185fac00d251e2ada02b45a7a7c5f589 + Size: 27 + MediaType: application/vnd.docker.image.rootfs.diff.tar.gzip + +[package-1] + Version: 1.0.1 + Type: deb + Metadata: + Found by: dpkg + +[package-2] + Version: 2.0.1 + Type: deb + Metadata: {package-2 1.0.2} + Found by: dpkg +