Skip to content

Commit 72cc13e

Browse files
committed
Fixed up the incorrect addition of a named package
1 parent b2206b2 commit 72cc13e

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

cmd/internal/converters/deployment_process_converter.go

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -118,30 +118,32 @@ func (c DeploymentProcessConverter) toHcl(resource octopus.DeploymentProcess, re
118118
ExcludedEnvironments: a.ExcludedEnvironments,
119119
Channels: a.Channels,
120120
TenantTags: a.TenantTags,
121-
Package: make([]terraform.TerraformPackage, len(a.Packages)),
121+
Package: []terraform.TerraformPackage{},
122122
Condition: a.Condition,
123123
RunOnServer: c.getRunOnServer(a.Properties),
124124
Properties: nil,
125125
Features: c.getFeatures(a.Properties),
126126
}
127127

128-
for k, p := range a.Packages {
129-
if strutil.EmptyIfNil(p.Name) != "" {
130-
terraformResource.Step[i].Action[j].Package[k] = terraform.TerraformPackage{
131-
Name: p.Name,
132-
PackageID: p.PackageId,
133-
AcquisitionLocation: p.AcquisitionLocation,
134-
ExtractDuringDeployment: p.ExtractDuringDeployment,
135-
FeedId: dependencies.GetResourcePointer("Feeds", p.FeedId),
136-
Id: p.Id,
137-
Properties: c.replaceIds(p.Properties, dependencies),
138-
}
128+
for _, p := range a.Packages {
129+
if strutil.NilIfEmptyPointer(p.Name) != nil {
130+
terraformResource.Step[i].Action[j].Package = append(
131+
terraformResource.Step[i].Action[j].Package,
132+
terraform.TerraformPackage{
133+
Name: p.Name,
134+
PackageID: p.PackageId,
135+
AcquisitionLocation: p.AcquisitionLocation,
136+
ExtractDuringDeployment: &p.ExtractDuringDeployment,
137+
FeedId: dependencies.GetResourcePointer("Feeds", p.FeedId),
138+
Id: p.Id,
139+
Properties: c.replaceIds(p.Properties, dependencies),
140+
})
139141
} else {
140142
terraformResource.Step[i].Action[j].PrimaryPackage = &terraform.TerraformPackage{
141143
Name: nil,
142144
PackageID: p.PackageId,
143145
AcquisitionLocation: p.AcquisitionLocation,
144-
ExtractDuringDeployment: p.ExtractDuringDeployment,
146+
ExtractDuringDeployment: nil,
145147
FeedId: dependencies.GetResourcePointer("Feeds", p.FeedId),
146148
Id: p.Id,
147149
Properties: c.replaceIds(p.Properties, dependencies),

cmd/internal/model/terraform/terraform_deployment_process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type TerraformPackage struct {
4848
Name *string `hcl:"name"`
4949
PackageID *string `hcl:"package_id"`
5050
AcquisitionLocation *string `hcl:"acquisition_location"`
51-
ExtractDuringDeployment bool `hcl:"extract_during_deployment"`
51+
ExtractDuringDeployment *bool `hcl:"extract_during_deployment"`
5252
FeedId *string `hcl:"feed_id"`
5353
Id *string `hcl:"id"`
5454
Properties map[string]string `hcl:"properties"`

wasm/convert_project.wasm

841 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)