Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mmv1/provider/template_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ func (td *TemplateData) GenerateFWResourceFile(filePath string, resource api.Res

func (td *TemplateData) GenerateMetadataFile(filePath string, resource api.Resource) {
metadata := metadata.FromResource(resource)
bytes, err := yaml.Marshal(metadata)
metadataBytes, err := yaml.Marshal(metadata)
if err != nil {
glog.Exit("error marshalling yaml %v: %v", filePath)
}
err = os.WriteFile(filePath, bytes, 0644)
err = os.WriteFile(filePath, metadataBytes, 0644)
if err != nil {
glog.Exit(err)
}
Expand Down
6 changes: 6 additions & 0 deletions mmv1/provider/terraform.go
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,12 @@ func (t Terraform) addHashicorpCopyRightHeader(outputFolder, target string) {
log.Fatalf("Cannot read file %s to add Hashicorp copy right: %s", targetFile, err)
}

source := string(sourceByte)
if strings.Contains(source, "Copyright IBM Corp. 2014, 2026") &&
strings.Contains(source, "SPDX-License-Identifier: MPL-2.0") {
return
}

sourceByte = google.Concat([]byte(header), sourceByte)
err = os.WriteFile(targetFile, sourceByte, 0644)
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) HashiCorp, Inc.
// Copyright IBM Corp. 2014, 2026
// SPDX-License-Identifier: MPL-2.0

// ----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) HashiCorp, Inc.
// Copyright IBM Corp. 2014, 2026
// SPDX-License-Identifier: MPL-2.0

// IAM list resources enumerate rows for google_*_iam_member instances by reading
Expand Down
Loading