Add zap option flags (#106)

Author: kunalvalia

main.go

@@ -37,9 +37,16 @@ func main() {
 	flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
+	opts := zap.Options{}
+	opts.BindFlags(flag.CommandLine)
+	err := flag.Set("zap-devel", "true")
+	if err != nil {
+		setupLog.Error(err, "unable to set zap flag")
+	}
+
 	flag.Parse()
 
-	ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Namespace:          namespaceName,

workspacehelper/tfc_org.go

@@ -167,9 +167,12 @@ func (t *TerraformCloudClient) updateAgentPoolID(instance *appv1alpha1.Workspace
 func (t *TerraformCloudClient) CheckWorkspace(workspace string, instance *appv1alpha1.Workspace) (*tfc.Workspace, error) {
 	ws, err := t.Client.Workspaces.Read(context.TODO(), t.Organization, workspace)
 	if err != nil && err == tfc.ErrResourceNotFound {
-		id, err := t.CreateWorkspace(workspace, instance)
-		if err != nil {
-			return nil, err
+		id, wsErr := t.CreateWorkspace(workspace, instance)
+		if wsErr != nil {
+			return nil, wsErr
+		} else {
+			ws = &tfc.Workspace{ID: id}
+			err = nil
 		}
 		ws = &tfc.Workspace{ID: id}
 	} else if err != nil {