fix tests, update run triggers to handle deprecated in the same way

Author: notchairmk

notification_configuration.go

@@ -307,6 +307,8 @@ func (s *notificationConfigurations) Read(ctx context.Context, notificationConfi
 		return nil, err
 	}
 
+	backfillDeprecatedSubscribable(nc)
+
 	return nc, nil
 }
 
@@ -332,6 +334,8 @@ func (s *notificationConfigurations) Update(ctx context.Context, notificationCon
 		return nil, err
 	}
 
+	backfillDeprecatedSubscribable(nc)
+
 	return nc, nil
 }
 

notification_configuration_integration_test.go

@@ -70,7 +70,7 @@ func TestNotificationConfigurationList(t *testing.T) {
 			nil,
 		)
 		assert.Nil(t, ncl)
-		assert.EqualError(t, err, ErrInvalidWorkspaceID.Error())
+		assert.EqualError(t, err, ErrRequiredDestinationType.Error())
 	})
 }
 

run_trigger.go

@@ -57,7 +57,7 @@ type RunTrigger struct {
 	SourceableName string    `jsonapi:"attr,sourceable-name"`
 	WorkspaceName  string    `jsonapi:"attr,workspace-name"`
 	// DEPRECATED. The sourceable field is polymorphic. Use SourceableChoice instead.
-	Sourceable       *Workspace        `jsonapi:"relation,sourceable"`
+	Sourceable       *Workspace        `jsonapi:"relation,sourceable,omitempty"`
 	SourceableChoice *SourceableChoice `jsonapi:"polyrelation,sourceable"`
 	Workspace        *Workspace        `jsonapi:"relation,workspace"`
 }
@@ -121,6 +121,10 @@ func (s *runTriggers) List(ctx context.Context, workspaceID string, options *Run
 		return nil, err
 	}
 
+	for i := range rtl.Items {
+		backfillDeprecatedSourceable(rtl.Items[i])
+	}
+
 	return rtl, nil
 }
 
@@ -145,6 +149,8 @@ func (s *runTriggers) Create(ctx context.Context, workspaceID string, options Ru
 		return nil, err
 	}
 
+	backfillDeprecatedSourceable(rt)
+
 	return rt, nil
 }
 
@@ -166,6 +172,8 @@ func (s *runTriggers) Read(ctx context.Context, runTriggerID string) (*RunTrigge
 		return nil, err
 	}
 
+	backfillDeprecatedSourceable(rt)
+
 	return rt, nil
 }
 
@@ -203,6 +211,14 @@ func (o *RunTriggerListOptions) valid() error {
 	return nil
 }
 
+func backfillDeprecatedSourceable(runTrigger *RunTrigger) {
+	if runTrigger.Sourceable != nil || runTrigger.SourceableChoice == nil {
+		return
+	}
+
+	runTrigger.Sourceable = runTrigger.SourceableChoice.Workspace
+}
+
 func validateRunTriggerFilterParam(filterParam RunTriggerFilterOp, includeParams []RunTriggerIncludeOpt) error {
 	switch filterParam {
 	case RunTriggerOutbound, RunTriggerInbound: