Skip to content

Commit 9c80a37

Browse files
author
Aalyria Technologies, Inc
committed
Import changes.
- 814a3a2d9489e74451299270bea467c6b8af7af4 - 0139de21844066829294ada19184764bc86a02f7 - c56adbc5ef133d954c344cb754dbb8602237be4c - 911cd686690b6db24c777db2da1ed0a073089f75 - 73b6656ab9f9099dabc1f7f07df6db99b8c84e9b - 1da8f7196d24e44a50d6ca123d053cfd95fe66ff - fb9332a159a13d48585e1d5a669e3b0db49f9353 - 2ad380662e045b70ce7904437ff4817a10533dc8 - 28015e230b03a4ba42249c483e3bfc267bd3b29d - 4caaba796c50798d1fff1ddcc4946483c9c1e4b9 - de13973f7c0bdbbab5567cb982d11ca4c7875eef - e52781b528e9cb5970541737ae8ab57ff02f8ff6 - 6ba066f98322c73bfca35629ca854145e0219cd9 - d126c76183254f3831a8781e92309f51eeebbb06 - d0094a96aa254e6adb0a1690fe49cf301ac76597 - 4e37dd7d22eebed9fbbfe1170c28196f62194415 - e0bd61c55ada84732a200bb2bcd8f8330fbd4b8f - be6893839560641fe5a328e9e12580d52be57c74 - dc49a5c0954e3df43660fd61541fce112d20d979 - db3a2538987e191cf73b86d72b994adefd94cc80 - af847b94652d7e789f4a361b41fc1bdff1c579f2 - 5d4aeb9225a22d8efe70ba0abf63766ca6b543bd - 673fa2092557af54adbf34a902a7ed1e5b0b5888 - 7cb362a04df313cd56de48179962e8299c965ffc - 66b129db89e85b0891db1ab546b17df940ee63aa - b9a1121aef070f3f29c1c4c531475019a00f3733 - 1af3f82c14e6ca6e6480c2bbe95b175df39d44b6 - 6520c5045e41b90be5a83e921213215fe3590a5f - 023535cd6ac1b0c928796244161db17da77f89de - 92b7907660ea71bf15c37c59cc583ad93b7cda45 - 142fbf7bd2891400334cfcfcd2d59dd84fddc7b4 - 58d1fcc52efe0711e5df40404196e04c94cc5ada - 952885166c23413adf60769105bdbe2e9ac66c69 - 46c63458d53870b63c9b6130a9e6266740b0ac1d - 136929c55fa8c79d88f8fce60957a4c631b01bf4 - 364a74e286345066206ce692f5547611c4f36b46 - ed63bf4530e1b0fe8135e670e0d8ebee9f64be16 - 437f4167a4d9a3c6976d614a6ce3b859abd9abae - cc555d518d7e40c0f99117f7a8c5ac2a36ad79bd - 873144921cc26a35664990ce1b84f7f4075c0b0a - 4ad85a5b578a2e886e6ceefaf84cf9d0ac05fb8b - 26b16821e80780f42bf7b23e951bdde8e44e7872 - 12d2d369c120f8dccfbea69cfc0b229d5b455d6e - b9739789d0102977f3d9477cec535e5ad5ea5eae - 20a750b0689325f349f15acc9f0e70623736cc17 - 807b89bcdbc729ed50e88601a74bd46442b8138e - 2f04c6adc5750fc1226f2d4df8e10c1e0d7971a1 - 9e76ec46fde602a6f1370c3c290193221db06b1b - 1e0720534316082dbab7477e3230a378c519d151 - 677895b8c71daa710cd8f85cd60b72cbc5303ce2 - c0d9709b5665b437d822b148e6231c8ccf2eb947 - 3e9190e03dbbb42648248d2373adf90874baef1a - 5d16f1083d5418b2d304140d5683981c4199d4f7 - e43abc0859127cd751bf24bb7e310aaa5a97d35d - d03c038366b786445167a8bff7d681bb33fe299f - ec2e9c14858f21b76afe21a89a43613414b21740 - 3dff9ff7b68f040c8fadc08833b8c552c70b237a - dc22acdc0a5b02c4abfb2dbaeb220309449bcb55 - 69ef435a4a697b370e1febfb99973ebd2679d194 - 8983fe27e2c28f3ec162c8bc5e8bf6dae7ad36f6 - 8eca1fda1ef7d5cd779b1dbf2a7bd44e76505e40 - 3a3e68788ce1f854adc805de12fa2da31a36336d - 583333dc3b9d112a28e02fd98b289129cd0adc49 - 23bfd258643b2e797592d5de449c035eb25a548b - d59eaf60d0a6b0b9f99646e0fddb40327f155dc6 - 3df2baa5b555c8cfbf153108da64480036f20d99 - 635e00f025322b929ac378e2be8888c61f10f7ba - fbae1d6beadeb3b552bf6ac9a283aaff1e95a319 - f4e5a82d315eab2300e18c3cf1a1392148abc1cb - 9c0f23808d8dce74f0ed086c0907a2c930d65298 - 364b2a72c96ccd781f34f7f09f5ce9a0df50fa25 - 39bf1e177ca5eff6b2705eeb334438e239063569 - 83fce14bdefe1636972c1becade550dcb60f928c - bd84932d0523939346a3ff309421da1679c76125 - 9c2470fbd682ab8d60b432d999948c6f3a6e66f8 - 3241ef40729d0c59203c7612d86829c985a6d64c - eecd76470c460818210efb6d2c5a5217113b41bc - 5adb5450f502603677f67e4e461435c99568795a - 414441dfb99cc4f6ca1479f70922bc65f9cd8c01 - 6bc0da39105e50672f079ba5c5d785cb9d815886 - 7b4df20bae41138ed628d37cb5f3c5796f08142f - 1905c52b49ce97503e8a348b4f5114155b1c4a3d - f23ccdb1e0d46565657f5027d14415623c20618a - 57b0ed291a6a7092bffe404bd23e4157ff16286a - f15f1f35adaef430ff1ba66ca7ff3c443e8ca675 - 5bcb94da4dab7465dd3d58c78d3cb249343cf88f - 5f46a1642ecff1b1b143db0eab73d449bde69eb8 - e927395791a6defaec7c5f2e57d3a91a9e40c074 - 591ee5c16ab8b6e36fbbc3874f71ccd410986f77 - 9e4e4411c7831916b86ce8e3d9e74516a8ddf188 - 3ed0529b189e8ebe2d8cacdccdf6912115d81106 - e6d5514283e4aa88946e1eb2857b733f2a39022c - b44776955397727d09911e75fa54e2c540f58552 - b91aa9dd2e1d51c74702e992882386342f571018 - 218a683ab8ab153702d1327d129e34bb673ced19 - ecc91c55dfff81cd8374be6ee0a19cd711fb4583 - 3d87332e557378c258f09496bf02227240a0ebf3 - ad933e516e8d1c075751b9fba20457c5666f3665 - e5f4398dbf2465c13ed75fff1a8785c6f0a892be - 7be373e65335aa465ab3d43149d9c9df007ddced (And 554 more changes) GitOrigin-RevId: 814a3a2d9489e74451299270bea467c6b8af7af4
1 parent b67cf30 commit 9c80a37

File tree

1 file changed

+1
-249
lines changed

1 file changed

+1
-249
lines changed

tools/nbictl/provisioning.go

Lines changed: 1 addition & 249 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ type ProvisioningResources struct {
4040
downtimes map[string]*provapipb.Downtime
4141
protectionAssociationGroups map[string]*provapipb.ProtectionAssociationGroup
4242
disjointAssociationGroups map[string]*provapipb.DisjointAssociationGroup
43-
links map[string]*provapipb.Link
44-
geographicRegions map[string]*provapipb.GeographicRegion
45-
emissionsLimits map[string]*provapipb.EmissionsLimit
46-
emissionsTargets map[string]*provapipb.EmissionsTarget
4743
}
4844

4945
func (pr *ProvisioningResources) String() string {
@@ -53,10 +49,6 @@ func (pr *ProvisioningResources) String() string {
5349
lo.Keys(pr.downtimes),
5450
lo.Keys(pr.protectionAssociationGroups),
5551
lo.Keys(pr.disjointAssociationGroups),
56-
lo.Keys(pr.links),
57-
lo.Keys(pr.geographicRegions),
58-
lo.Keys(pr.emissionsLimits),
59-
lo.Keys(pr.emissionsTargets),
6052
)
6153

6254
if len(keys) == 0 {
@@ -81,10 +73,6 @@ func (pr *ProvisioningResources) MarshalledString(marshaller protoFormat) string
8173
lo.Entries(marshalMap(pr.downtimes, marshaller)),
8274
lo.Entries(marshalMap(pr.protectionAssociationGroups, marshaller)),
8375
lo.Entries(marshalMap(pr.disjointAssociationGroups, marshaller)),
84-
lo.Entries(marshalMap(pr.links, marshaller)),
85-
lo.Entries(marshalMap(pr.geographicRegions, marshaller)),
86-
lo.Entries(marshalMap(pr.emissionsLimits, marshaller)),
87-
lo.Entries(marshalMap(pr.emissionsTargets, marshaller)),
8876
)
8977
slices.SortFunc(entries, func(e1, e2 lo.Entry[string, string]) int { return strings.Compare(e1.Key, e2.Key) })
9078

@@ -101,10 +89,6 @@ func NewProvisioningResources() *ProvisioningResources {
10189
downtimes: map[string]*provapipb.Downtime{},
10290
protectionAssociationGroups: map[string]*provapipb.ProtectionAssociationGroup{},
10391
disjointAssociationGroups: map[string]*provapipb.DisjointAssociationGroup{},
104-
links: map[string]*provapipb.Link{},
105-
geographicRegions: map[string]*provapipb.GeographicRegion{},
106-
emissionsLimits: map[string]*provapipb.EmissionsLimit{},
107-
emissionsTargets: map[string]*provapipb.EmissionsTarget{},
10892
}
10993
}
11094

@@ -113,11 +97,7 @@ func (pr *ProvisioningResources) ResourceCount() int {
11397
len(pr.p2pSrTePolicyCandidatePaths) +
11498
len(pr.downtimes) +
11599
len(pr.protectionAssociationGroups) +
116-
len(pr.disjointAssociationGroups) +
117-
len(pr.links) +
118-
len(pr.geographicRegions) +
119-
len(pr.emissionsLimits) +
120-
len(pr.emissionsTargets)
100+
len(pr.disjointAssociationGroups)
121101
}
122102

123103
func (pr *ProvisioningResources) InsertProvisioningResources(resources *provnbipb.ProvisioningResources) {
@@ -126,10 +106,6 @@ func (pr *ProvisioningResources) InsertProvisioningResources(resources *provnbip
126106
pr.insertDowntimes(resources.GetDowntimes())
127107
pr.insertProtectionAssociationGroups(resources.GetProtectionAssociationGroups())
128108
pr.insertDisjointAssociationGroups(resources.GetDisjointAssociationGroups())
129-
pr.insertLinks(resources.GetLinks())
130-
pr.insertGeographicRegions(resources.GetGeographicRegions())
131-
pr.insertEmissionsLimits(resources.GetEmissionsLimits())
132-
pr.insertEmissionsTargets(resources.GetEmissionsTargets())
133109
}
134110

135111
func ProvisioningResourcesFromRemote(ctx context.Context, client provapipb.ProvisioningClient) (*ProvisioningResources, error) {
@@ -167,46 +143,6 @@ func ProvisioningResourcesFromRemote(ctx context.Context, client provapipb.Provi
167143
return nil
168144
})
169145

170-
var links []*provapipb.Link
171-
p.Go(func() error {
172-
result, err := client.ListLinks(ctx, &provapipb.ListLinksRequest{})
173-
if err != nil {
174-
return err
175-
}
176-
links = result.GetLinks()
177-
return nil
178-
})
179-
180-
var geographicRegions []*provapipb.GeographicRegion
181-
p.Go(func() error {
182-
result, err := client.ListGeographicRegions(ctx, &provapipb.ListGeographicRegionsRequest{})
183-
if err != nil {
184-
return err
185-
}
186-
geographicRegions = result.GetGeographicRegions()
187-
return nil
188-
})
189-
190-
var emissionsLimits []*provapipb.EmissionsLimit
191-
p.Go(func() error {
192-
result, err := client.ListEmissionsLimits(ctx, &provapipb.ListEmissionsLimitsRequest{})
193-
if err != nil {
194-
return err
195-
}
196-
emissionsLimits = result.GetEmissionsLimits()
197-
return nil
198-
})
199-
200-
var emissionsTargets []*provapipb.EmissionsTarget
201-
p.Go(func() error {
202-
result, err := client.ListEmissionsTargets(ctx, &provapipb.ListEmissionsTargetsRequest{})
203-
if err != nil {
204-
return err
205-
}
206-
emissionsTargets = result.GetEmissionsTargets()
207-
return nil
208-
})
209-
210146
result, err := client.ListP2PSrTePolicies(ctx, &provapipb.ListP2PSrTePoliciesRequest{})
211147
if err != nil {
212148
return nil, err
@@ -240,10 +176,6 @@ func ProvisioningResourcesFromRemote(ctx context.Context, client provapipb.Provi
240176
pr.insertDowntimes(downtimes)
241177
pr.insertProtectionAssociationGroups(protectionAssociationGroups)
242178
pr.insertDisjointAssociationGroups(disjointAssociationGroups)
243-
pr.insertLinks(links)
244-
pr.insertGeographicRegions(geographicRegions)
245-
pr.insertEmissionsLimits(emissionsLimits)
246-
pr.insertEmissionsTargets(emissionsTargets)
247179

248180
return pr, nil
249181
}
@@ -278,30 +210,6 @@ func (pr *ProvisioningResources) insertDisjointAssociationGroups(entries []*prov
278210
}
279211
}
280212

281-
func (pr *ProvisioningResources) insertLinks(entries []*provapipb.Link) {
282-
for _, entry := range entries {
283-
pr.links[entry.GetName()] = entry
284-
}
285-
}
286-
287-
func (pr *ProvisioningResources) insertGeographicRegions(entries []*provapipb.GeographicRegion) {
288-
for _, entry := range entries {
289-
pr.geographicRegions[entry.GetName()] = entry
290-
}
291-
}
292-
293-
func (pr *ProvisioningResources) insertEmissionsLimits(entries []*provapipb.EmissionsLimit) {
294-
for _, entry := range entries {
295-
pr.emissionsLimits[entry.GetName()] = entry
296-
}
297-
}
298-
299-
func (pr *ProvisioningResources) insertEmissionsTargets(entries []*provapipb.EmissionsTarget) {
300-
for _, entry := range entries {
301-
pr.emissionsTargets[entry.GetName()] = entry
302-
}
303-
}
304-
305213
func provisioningResourcesAreEquivalent[T proto.Message](a, b T) bool {
306214
// TODO: find a more robust equivalency check.
307215
return proto.Equal(a, b)
@@ -382,10 +290,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
382290
"downtimes": lo.Without(lo.Keys(localResources.downtimes), lo.Keys(remoteResources.downtimes)...),
383291
"protectionAssociationGroups": lo.Without(lo.Keys(localResources.protectionAssociationGroups), lo.Keys(remoteResources.protectionAssociationGroups)...),
384292
"disjointAssociationGroups": lo.Without(lo.Keys(localResources.disjointAssociationGroups), lo.Keys(remoteResources.disjointAssociationGroups)...),
385-
"links": lo.Without(lo.Keys(localResources.links), lo.Keys(remoteResources.links)...),
386-
"geographicRegions": lo.Without(lo.Keys(localResources.geographicRegions), lo.Keys(remoteResources.geographicRegions)...),
387-
"emissionsLimits": lo.Without(lo.Keys(localResources.emissionsLimits), lo.Keys(remoteResources.emissionsLimits)...),
388-
"emissionsTargets": lo.Without(lo.Keys(localResources.emissionsTargets), lo.Keys(remoteResources.emissionsTargets)...),
389293
}
390294

391295
resourcesInCommon := map[string][]string{
@@ -394,10 +298,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
394298
"downtimes": lo.Intersect(lo.Keys(localResources.downtimes), lo.Keys(remoteResources.downtimes)),
395299
"protectionAssociationGroups": lo.Intersect(lo.Keys(localResources.protectionAssociationGroups), lo.Keys(remoteResources.protectionAssociationGroups)),
396300
"disjointAssociationGroups": lo.Intersect(lo.Keys(localResources.disjointAssociationGroups), lo.Keys(remoteResources.disjointAssociationGroups)),
397-
"links": lo.Intersect(lo.Keys(localResources.links), lo.Keys(remoteResources.links)),
398-
"geographicRegions": lo.Intersect(lo.Keys(localResources.geographicRegions), lo.Keys(remoteResources.geographicRegions)),
399-
"emissionsLimits": lo.Intersect(lo.Keys(localResources.emissionsLimits), lo.Keys(remoteResources.emissionsLimits)),
400-
"emissionsTargets": lo.Intersect(lo.Keys(localResources.emissionsTargets), lo.Keys(remoteResources.emissionsTargets)),
401301
}
402302

403303
fmt.Println("\ncomparing local and remote resources:")
@@ -415,10 +315,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
415315
downtimes: lo.Without(lo.Keys(remoteResources.downtimes), lo.Keys(localResources.downtimes)...),
416316
protectionAssociationGroups: lo.Without(lo.Keys(remoteResources.protectionAssociationGroups), lo.Keys(localResources.protectionAssociationGroups)...),
417317
disjointAssociationGroups: lo.Without(lo.Keys(remoteResources.disjointAssociationGroups), lo.Keys(localResources.disjointAssociationGroups)...),
418-
links: lo.Without(lo.Keys(remoteResources.links), lo.Keys(localResources.links)...),
419-
geographicRegions: lo.Without(lo.Keys(remoteResources.geographicRegions), lo.Keys(localResources.geographicRegions)...),
420-
emissionsLimits: lo.Without(lo.Keys(remoteResources.emissionsLimits), lo.Keys(localResources.emissionsLimits)...),
421-
emissionsTargets: lo.Without(lo.Keys(remoteResources.emissionsTargets), lo.Keys(localResources.emissionsTargets)...),
422318

423319
printMode: printMode,
424320
dryRunMode: dryRunMode,
@@ -431,10 +327,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
431327
deleteParams.downtimes,
432328
deleteParams.protectionAssociationGroups,
433329
deleteParams.disjointAssociationGroups,
434-
deleteParams.links,
435-
deleteParams.geographicRegions,
436-
deleteParams.emissionsLimits,
437-
deleteParams.emissionsTargets,
438330
)))
439331

440332
err := deleteProvisioning(ctx, deleteParams)
@@ -495,46 +387,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
495387
return err
496388
})...)
497389
})
498-
p.Go(func() error {
499-
return errors.Join(updateRemoteResources[*provapipb.Link](
500-
resourcesInCommon["links"], localResources.links, remoteResources.links, printMode, dryRunMode, func(link *provapipb.Link) error {
501-
_, err := provisioningClient.UpdateLink(ctx, &provapipb.UpdateLinkRequest{
502-
Link: link,
503-
AllowMissing: false,
504-
})
505-
return err
506-
})...)
507-
})
508-
p.Go(func() error {
509-
return errors.Join(updateRemoteResources[*provapipb.GeographicRegion](
510-
resourcesInCommon["geographicRegions"], localResources.geographicRegions, remoteResources.geographicRegions, printMode, dryRunMode, func(geographicRegion *provapipb.GeographicRegion) error {
511-
_, err := provisioningClient.UpdateGeographicRegion(ctx, &provapipb.UpdateGeographicRegionRequest{
512-
GeographicRegion: geographicRegion,
513-
AllowMissing: false,
514-
})
515-
return err
516-
})...)
517-
})
518-
p.Go(func() error {
519-
return errors.Join(updateRemoteResources[*provapipb.EmissionsLimit](
520-
resourcesInCommon["emissionsLimits"], localResources.emissionsLimits, remoteResources.emissionsLimits, printMode, dryRunMode, func(emissionsLimit *provapipb.EmissionsLimit) error {
521-
_, err := provisioningClient.UpdateEmissionsLimit(ctx, &provapipb.UpdateEmissionsLimitRequest{
522-
EmissionsLimit: emissionsLimit,
523-
AllowMissing: false,
524-
})
525-
return err
526-
})...)
527-
})
528-
p.Go(func() error {
529-
return errors.Join(updateRemoteResources[*provapipb.EmissionsTarget](
530-
resourcesInCommon["emissionsTargets"], localResources.emissionsTargets, remoteResources.emissionsTargets, printMode, dryRunMode, func(emissionsTarget *provapipb.EmissionsTarget) error {
531-
_, err := provisioningClient.UpdateEmissionsTarget(ctx, &provapipb.UpdateEmissionsTargetRequest{
532-
EmissionsTarget: emissionsTarget,
533-
AllowMissing: false,
534-
})
535-
return err
536-
})...)
537-
})
538390

539391
///
540392
// Add resources.
@@ -591,46 +443,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
591443
return err
592444
})...)
593445
})
594-
p.Go(func() error {
595-
return errors.Join(createRemoteResources[*provapipb.Link](
596-
resourcesToBeAdded["links"], localResources.links, printMode, dryRunMode, func(link *provapipb.Link) error {
597-
_, err := provisioningClient.UpdateLink(ctx, &provapipb.UpdateLinkRequest{
598-
Link: link,
599-
AllowMissing: true,
600-
})
601-
return err
602-
})...)
603-
})
604-
p.Go(func() error {
605-
return errors.Join(createRemoteResources[*provapipb.GeographicRegion](
606-
resourcesToBeAdded["geographicRegions"], localResources.geographicRegions, printMode, dryRunMode, func(geographicRegion *provapipb.GeographicRegion) error {
607-
_, err := provisioningClient.UpdateGeographicRegion(ctx, &provapipb.UpdateGeographicRegionRequest{
608-
GeographicRegion: geographicRegion,
609-
AllowMissing: true,
610-
})
611-
return err
612-
})...)
613-
})
614-
p.Go(func() error {
615-
return errors.Join(createRemoteResources[*provapipb.EmissionsLimit](
616-
resourcesToBeAdded["emissionsLimits"], localResources.emissionsLimits, printMode, dryRunMode, func(emissionsLimit *provapipb.EmissionsLimit) error {
617-
_, err := provisioningClient.UpdateEmissionsLimit(ctx, &provapipb.UpdateEmissionsLimitRequest{
618-
EmissionsLimit: emissionsLimit,
619-
AllowMissing: true,
620-
})
621-
return err
622-
})...)
623-
})
624-
p.Go(func() error {
625-
return errors.Join(createRemoteResources[*provapipb.EmissionsTarget](
626-
resourcesToBeAdded["emissionsTargets"], localResources.emissionsTargets, printMode, dryRunMode, func(emissionsTarget *provapipb.EmissionsTarget) error {
627-
_, err := provisioningClient.UpdateEmissionsTarget(ctx, &provapipb.UpdateEmissionsTargetRequest{
628-
EmissionsTarget: emissionsTarget,
629-
AllowMissing: true,
630-
})
631-
return err
632-
})...)
633-
})
634446

635447
errs = append(errs, p.Wait())
636448
return errors.Join(errs...)
@@ -665,10 +477,6 @@ type deleteProvisioningParams struct {
665477
downtimes []string
666478
protectionAssociationGroups []string
667479
disjointAssociationGroups []string
668-
links []string
669-
geographicRegions []string
670-
emissionsLimits []string
671-
emissionsTargets []string
672480

673481
printMode bool
674482
dryRunMode bool
@@ -743,50 +551,6 @@ func deleteProvisioning(ctx context.Context, params deleteProvisioningParams) er
743551
})...)
744552
})
745553
}
746-
if len(params.links) > 0 {
747-
p.Go(func() error {
748-
return errors.Join(deleteRemoteResources(
749-
params.links, printMode, dryRunMode, func(link string) error {
750-
_, err := client.DeleteLink(ctx, &provapipb.DeleteLinkRequest{
751-
Name: link,
752-
})
753-
return err
754-
})...)
755-
})
756-
}
757-
if len(params.geographicRegions) > 0 {
758-
p.Go(func() error {
759-
return errors.Join(deleteRemoteResources(
760-
params.geographicRegions, printMode, dryRunMode, func(geographicRegion string) error {
761-
_, err := client.DeleteGeographicRegion(ctx, &provapipb.DeleteGeographicRegionRequest{
762-
Name: geographicRegion,
763-
})
764-
return err
765-
})...)
766-
})
767-
}
768-
if len(params.emissionsLimits) > 0 {
769-
p.Go(func() error {
770-
return errors.Join(deleteRemoteResources(
771-
params.emissionsLimits, printMode, dryRunMode, func(emissionsLimit string) error {
772-
_, err := client.DeleteEmissionsLimit(ctx, &provapipb.DeleteEmissionsLimitRequest{
773-
Name: emissionsLimit,
774-
})
775-
return err
776-
})...)
777-
})
778-
}
779-
if len(params.emissionsTargets) > 0 {
780-
p.Go(func() error {
781-
return errors.Join(deleteRemoteResources(
782-
params.emissionsTargets, printMode, dryRunMode, func(emissionsTarget string) error {
783-
_, err := client.DeleteEmissionsTarget(ctx, &provapipb.DeleteEmissionsTargetRequest{
784-
Name: emissionsTarget,
785-
})
786-
return err
787-
})...)
788-
})
789-
}
790554

791555
return p.Wait()
792556
}
@@ -819,10 +583,6 @@ func ProvisioningDeleteAll(appCtx *cli.Context) error {
819583
downtimes: lo.Keys(remoteResources.downtimes),
820584
protectionAssociationGroups: lo.Keys(remoteResources.protectionAssociationGroups),
821585
disjointAssociationGroups: lo.Keys(remoteResources.disjointAssociationGroups),
822-
links: lo.Keys(remoteResources.links),
823-
geographicRegions: lo.Keys(remoteResources.geographicRegions),
824-
emissionsLimits: lo.Keys(remoteResources.emissionsLimits),
825-
emissionsTargets: lo.Keys(remoteResources.emissionsTargets),
826586
}
827587

828588
return deleteProvisioning(appCtx.Context, params)
@@ -861,21 +621,13 @@ func ProvisioningDelete(appCtx *cli.Context) error {
861621
params.downtimes = lo.Intersect(resourceNames, lo.Keys(remoteResources.downtimes))
862622
params.protectionAssociationGroups = lo.Intersect(resourceNames, lo.Keys(remoteResources.protectionAssociationGroups))
863623
params.disjointAssociationGroups = lo.Intersect(resourceNames, lo.Keys(remoteResources.disjointAssociationGroups))
864-
params.links = lo.Intersect(resourceNames, lo.Keys(remoteResources.links))
865-
params.geographicRegions = lo.Intersect(resourceNames, lo.Keys(remoteResources.geographicRegions))
866-
params.emissionsLimits = lo.Intersect(resourceNames, lo.Keys(remoteResources.emissionsLimits))
867-
params.emissionsTargets = lo.Intersect(resourceNames, lo.Keys(remoteResources.emissionsTargets))
868624

869625
deleteResourceNameSet := slices.Concat(
870626
params.p2pSrTePolicies,
871627
params.p2pSrTePolicyCandidatePaths,
872628
params.downtimes,
873629
params.protectionAssociationGroups,
874630
params.disjointAssociationGroups,
875-
params.links,
876-
params.geographicRegions,
877-
params.emissionsLimits,
878-
params.emissionsTargets,
879631
)
880632

881633
notFoundNames := lo.Without(resourceNames, deleteResourceNameSet...)

0 commit comments

Comments
 (0)