indexer: run ObtainSchema even if scheduling of an upstream job fails

hashicorp · Aug 10, 2022 · a2fa3a0 · a2fa3a0
1 parent d425b9a
commit a2fa3a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/internal/indexer/walker.go b/internal/indexer/walker.go
@@ -111,6 +111,7 @@ func (idx *Indexer) WalkedModule(ctx context.Context, modHandle document.DirHand
 	}
 
 	if dataDir.PluginLockFilePath != "" {
+		dependsOn := make(job.IDs, 0)
 		pSchemaVerId, err := idx.jobStore.EnqueueJob(job.Job{
 			Dir: modHandle,
 			Func: func(ctx context.Context) error {
@@ -123,6 +124,7 @@ func (idx *Indexer) WalkedModule(ctx context.Context, modHandle document.DirHand
 			errs = multierror.Append(errs, err)
 		} else {
 			ids = append(ids, pSchemaVerId)
+			dependsOn = append(dependsOn, pSchemaVerId)
 			refCollectionDeps = append(refCollectionDeps, pSchemaVerId)
 		}
 
@@ -133,7 +135,7 @@ func (idx *Indexer) WalkedModule(ctx context.Context, modHandle document.DirHand
 				return module.ObtainSchema(ctx, idx.modStore, idx.schemaStore, modHandle.Path())
 			},
 			Type:      op.OpTypeObtainSchema.String(),
-			DependsOn: job.IDs{pSchemaVerId},
+			DependsOn: dependsOn,
 		})
 		if err != nil {
 			errs = multierror.Append(errs, err)

diff --git a/internal/indexer/watcher.go b/internal/indexer/watcher.go
@@ -35,6 +35,7 @@ func (idx *Indexer) ModuleManifestChanged(ctx context.Context, modHandle documen
 
 func (idx *Indexer) PluginLockChanged(ctx context.Context, modHandle document.DirHandle) (job.IDs, error) {
 	ids := make(job.IDs, 0)
+	dependsOn := make(job.IDs, 0)
 	var errs *multierror.Error
 
 	pSchemaVerId, err := idx.jobStore.EnqueueJob(job.Job{
@@ -49,6 +50,7 @@ func (idx *Indexer) PluginLockChanged(ctx context.Context, modHandle document.Di
 		errs = multierror.Append(errs, err)
 	} else {
 		ids = append(ids, pSchemaVerId)
+		dependsOn = append(dependsOn, pSchemaVerId)
 	}
 
 	pSchemaId, err := idx.jobStore.EnqueueJob(job.Job{
@@ -59,7 +61,7 @@ func (idx *Indexer) PluginLockChanged(ctx context.Context, modHandle document.Di
 		},
 		IgnoreState: true,
 		Type:        op.OpTypeObtainSchema.String(),
-		DependsOn:   job.IDs{pSchemaVerId},
+		DependsOn:   dependsOn,
 	})
 	if err != nil {
 		errs = multierror.Append(errs, err)