Added the flavor conversion code by pkumarex · Pull Request #1 · pkumarex/utils

pkumarex · 2021-01-26T17:12:27Z

Included the flavor convert tool in tools repo.

tools/flavor-convert/go.mod

tools/flavor-convert/new_flavorpart.go

tools/flavor-convert/old_flavorpart.go

tools/flavor-convert/go.mod

ddhawal · 2021-02-22T16:44:25Z

tools/flavor-convert/main.go

+
+	//writing the new flavor part into the local file
+	data := []byte(finalFlavorPart)
+	err = ioutil.WriteFile("/opt/newflavorpart.json", data, 0644)


better if we take this as an argument also the signing keys

Here the output flavor part file is only a flavor collection not the signed flavor. So, we did not use any signing keys in flavor convert tool. Let us know your comments on this.

tools/flavor-convert/flavortemplate.go

tools/flavor-convert/main.go

ddhawal · 2021-03-03T07:10:49Z

tools/flavor-convert/main.go

+		}
+
+		for _, template := range templates {
+


remove unnecessary line breaks throughout

ddhawal · 2021-03-03T07:11:28Z

tools/flavor-convert/main.go

+
+			var rules []hvs.PcrRules
+
+			if flavorname == flavor.Flavor.Meta.Description.FlavorPart {


if possible break functionality in methods\functions

ddhawal · 2021-03-15T07:34:39Z

tools/flavor-convert/go.mod

+	github.com/vmware/govmomi v0.22.2
+)
+
+replace github.com/intel-secl/intel-secl/v3 => github.com/isteffyx/intel-secl/v3 v3.2.2


ddhawal · 2021-03-15T07:43:18Z

tools/flavor-convert/main.go

+func main() {
+	oldFlavorPartFilePath := flag.String("o", "", "old flavor part json file")
+	versionFlag := flag.Bool("version", false, "Print the current version and exit")
+	newFlavorPartFilePath := flag.String("n", "", "old flavor part json file")


update to = newflavor part json file

kwtj43

I couldn't build this doing...

"cd tools/flavor-convert" and then "make" --> "cp: cannot create directory '/opt/hvs-flavortemplates': No such file or directory"
"cd tools/flavor-convert" and then "go build main.go" --> ".\main.go:217:20: undefined: OldFlavorPart"

kwtj43 · 2021-03-23T03:31:23Z

tools/flavor-convert/flavortemplates/linux_tpm20_cbnt.template.json

@@ -0,0 +1,26 @@
+{


I don't think we should duplicate the flavor-templates (they will get out of date with the intel-secl repo). Let's just provide the tool/executable and require that the user of the converter to obtain the flavor-templates.

@ddhawal do you agree?

@kwtj43 Do we need to provide the flavor template in user command line instead of keeping it in the tools/flavor-convert/flavortemplates folder?

@kwtj43 Agree but as this is just a file, I doubt if we can import it. Variable can be imported.

@isteffyx Could you please check that up?

@ddhawal I have tried to import flavor template files from intel-secl repo. But I am getting "no such file or directory" error while reading.

kwtj43 · 2021-03-23T03:32:09Z

tools/flavor-convert/go.mod

+	github.com/vmware/govmomi v0.22.2
+)
+
+replace github.com/intel-secl/intel-secl/v3 => github.com/isteffyx/intel-secl/v3 v3.4.0


This tool should work with the latest Steffy's fork?

Here in flavor convert tool, we are using flavor template and new flavor part struct from intel-secl repo. But, Since the new flavor part changes are not present in intel-secl master branch, we have pushed the flavor creation/verification changes in our own repo (isteffyx/intel-secl) and replaced the intel-secl path with this repo path in go mod file. Once the flavor creation/verification changes are merged with intel-secl master branch, we will remove this path from go mod file.

tools/flavor-convert/main.go

mshamn6x · 2021-03-23T11:30:45Z

I couldn't build this doing...

"cd tools/flavor-convert" and then "make" --> "cp: cannot create directory '/opt/hvs-flavortemplates': No such file or directory"

"cd tools/flavor-convert" and then "go build main.go" --> ".\main.go:217:20: undefined: OldFlavorPart"

@kwtj43 To build Flavorconvert tool,

cd tools/flavor-convert and then "make all"

kwtj43 · 2021-03-23T17:03:06Z

tools/flavor-convert/Makefile

+VERSION := $(or ${GITTAG}, v0.0.0)
+
+all:
+	rm -rf /opt/hvs-flavortemplates


Similar to the flavor-gen, don't build things in the user's /opt directory. Put the output of make in a subdir of the project. On Windows...

$ make all
rm -rf /opt/hvs-flavortemplates
cp -r flavortemplates /opt/hvs-flavortemplates
cp: cannot create directory '/opt/hvs-flavortemplates': No such file or directory

We have read the flavor template files from the flavortemplates folder that is the subdirectory of the project.

isteffyx · 2021-03-25T06:50:10Z

I couldn't build this doing...

"cd tools/flavor-convert" and then "make" --> "cp: cannot create directory '/opt/hvs-flavortemplates': No such file or directory"

"cd tools/flavor-convert" and then "go build main.go" --> ".\main.go:217:20: undefined: OldFlavorPart"

@kwtj43 To build Flavorconvert tool,

cd tools/flavor-convert and then "make all"

Included the ESXI flavor templates.

Added the flavor conversion code

ca7c238

pkumarex requested a review from ddhawal January 28, 2021 17:52

ddhawal reviewed Feb 5, 2021

View reviewed changes

tools/flavor-convert/go.mod Outdated Show resolved Hide resolved

tools/flavor-convert/new_flavorpart.go Outdated Show resolved Hide resolved

tools/flavor-convert/old_flavorpart.go Show resolved Hide resolved

Addressed the comments provided

7f70011

ddhawal reviewed Feb 22, 2021

View reviewed changes

tools/flavor-convert/go.mod Outdated Show resolved Hide resolved

ddhawal reviewed Feb 22, 2021

View reviewed changes

ddhawal reviewed Feb 23, 2021

View reviewed changes

tools/flavor-convert/flavortemplate.go Outdated Show resolved Hide resolved

kvijay1918 added 2 commits March 1, 2021 06:55

Addressed the review comments

e1a62de

Addressed flavor template comments

6485429

ddhawal reviewed Mar 3, 2021

View reviewed changes

tools/flavor-convert/main.go Show resolved Hide resolved

ddhawal reviewed Mar 3, 2021

View reviewed changes

Addressed the review comments

d2073cb

ddhawal reviewed Mar 15, 2021

View reviewed changes

ddhawal approved these changes Mar 15, 2021

View reviewed changes

Addressed review comments

b989674

kwtj43 requested changes Mar 23, 2021

View reviewed changes

ddhawal approved these changes Mar 23, 2021

View reviewed changes

kwtj43 requested changes Mar 23, 2021

View reviewed changes

isteffyx added 4 commits March 24, 2021 01:55

Updated flavor template path

f685c0e

Addressed the review comment

5e04bed

Added esxi templates

d14ff4f

Updated version in go.mod

0ac87ce

Modified go.mod file

2ce22dd


		var rules []hvs.PcrRules

		if flavorname == flavor.Flavor.Meta.Description.FlavorPart {

Conversation

pkumarex commented Jan 26, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kwtj43 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mshamn6x commented Mar 23, 2021 • edited by isteffyx Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

isteffyx commented Mar 25, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

mshamn6x commented Mar 23, 2021 •

edited by isteffyx

Loading