Skip to content

Commit 2b3ff78

Browse files
Arta AsadiArta Asadi
Arta Asadi
authored and
Arta Asadi
committed
fix: remove loading
1 parent 907475e commit 2b3ff78

File tree

1 file changed

+37
-37
lines changed

1 file changed

+37
-37
lines changed

services/integration/utils/load-plugin.go

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func ValidateAndLoadPlugin(itOrm *gorm.DB, logger *zap.Logger, data []byte) erro
4747
}
4848

4949
func LoadPlugin(itOrm *gorm.DB, logger *zap.Logger, plugin platformspec.PluginSpecification) error {
50-
dbPlugin, pluginBinary, err := ExtractIntegrationBinaries(logger, plugin)
50+
dbPlugin, _, err := ExtractIntegrationBinaries(logger, plugin)
5151
if err != nil {
5252
return err
5353
}
@@ -62,26 +62,26 @@ func LoadPlugin(itOrm *gorm.DB, logger *zap.Logger, plugin platformspec.PluginSp
6262
return err
6363
}
6464

65-
err = itOrm.Clauses(clause.OnConflict{
66-
Columns: []clause.Column{{Name: "plugin_id"}},
67-
DoUpdates: clause.Assignments(map[string]interface{}{
68-
"integration_plugin": gorm.Expr(
69-
"CASE WHEN ? <> '' THEN CAST(? AS bytea) ELSE integration_plugin_binaries.integration_plugin END",
70-
pluginBinary.IntegrationPlugin,
71-
pluginBinary.IntegrationPlugin,
72-
),
73-
"cloud_ql_plugin": gorm.Expr(
74-
"CASE WHEN ? <> '' THEN CAST(? AS bytea) ELSE integration_plugin_binaries.cloud_ql_plugin END",
75-
pluginBinary.CloudQlPlugin,
76-
pluginBinary.CloudQlPlugin,
77-
),
78-
}),
79-
}).Create(pluginBinary).Error
80-
if err != nil {
81-
logger.Error("failed to create integration binary", zap.Error(err))
82-
return err
83-
}
84-
pluginBinary = nil
65+
//err = itOrm.Clauses(clause.OnConflict{
66+
// Columns: []clause.Column{{Name: "plugin_id"}},
67+
// DoUpdates: clause.Assignments(map[string]interface{}{
68+
// "integration_plugin": gorm.Expr(
69+
// "CASE WHEN ? <> '' THEN CAST(? AS bytea) ELSE integration_plugin_binaries.integration_plugin END",
70+
// pluginBinary.IntegrationPlugin,
71+
// pluginBinary.IntegrationPlugin,
72+
// ),
73+
// "cloud_ql_plugin": gorm.Expr(
74+
// "CASE WHEN ? <> '' THEN CAST(? AS bytea) ELSE integration_plugin_binaries.cloud_ql_plugin END",
75+
// pluginBinary.CloudQlPlugin,
76+
// pluginBinary.CloudQlPlugin,
77+
// ),
78+
// }),
79+
//}).Create(pluginBinary).Error
80+
//if err != nil {
81+
// logger.Error("failed to create integration binary", zap.Error(err))
82+
// return err
83+
//}
84+
//pluginBinary = nil
8585

8686
logger.Info("integration binary created")
8787

@@ -107,8 +107,8 @@ func ExtractIntegrationBinaries(logger *zap.Logger, plugin platformspec.PluginSp
107107
err = tagsJsonb.Set(tagsJsonData)
108108

109109
// download files from urls
110-
binaries := &models.IntegrationPluginBinary{
111-
PluginID: plugin.IntegrationType.String()}
110+
//binaries := &models.IntegrationPluginBinary{
111+
// PluginID: plugin.IntegrationType.String()}
112112
var describerURL, describerTags, demoDataUrl, url string
113113
discoveryType := models.IntegrationPluginDiscoveryTypeClassic
114114
installState := models.IntegrationTypeInstallStateNotInstalled
@@ -153,14 +153,14 @@ func ExtractIntegrationBinaries(logger *zap.Logger, plugin platformspec.PluginSp
153153
discoveryType = models.IntegrationPluginDiscoveryTypeTask
154154
}
155155
logger.Info("platform binary path", zap.String("path", baseDir+"/integarion_type/"+plugin.Components.PlatformBinary.PathInArchive))
156-
binaries.IntegrationPlugin, err = os.ReadFile(baseDir + "/integarion_type/" + plugin.Components.PlatformBinary.PathInArchive)
157-
if err != nil {
158-
logger.Error("failed to open integration-plugin file", zap.Error(err), zap.String("url", plugin.Components.PlatformBinary.URI))
159-
return nil, nil, fmt.Errorf("open integration-plugin file for url %s: %w", plugin, err)
160-
}
161-
162-
installState = models.IntegrationTypeInstallStateInstalled
163-
operationalStatus = models.IntegrationPluginOperationalStatusEnabled
156+
//binaries.IntegrationPlugin, err = os.ReadFile(baseDir + "/integarion_type/" + plugin.Components.PlatformBinary.PathInArchive)
157+
//if err != nil {
158+
// logger.Error("failed to open integration-plugin file", zap.Error(err), zap.String("url", plugin.Components.PlatformBinary.URI))
159+
// return nil, nil, fmt.Errorf("open integration-plugin file for url %s: %w", plugin, err)
160+
//}
161+
162+
//installState = models.IntegrationTypeInstallStateInstalled
163+
//operationalStatus = models.IntegrationPluginOperationalStatusEnabled
164164
}
165165
if plugin.Components.CloudQLBinary.URI != "" && plugin.Components.CloudQLBinary.PathInArchive != "" {
166166
if plugin.Components.CloudQLBinary.URI != plugin.Components.PlatformBinary.URI {
@@ -179,11 +179,11 @@ func ExtractIntegrationBinaries(logger *zap.Logger, plugin platformspec.PluginSp
179179
}
180180

181181
logger.Info("cloudql binary path", zap.String("path", baseDir+"/integarion_type/"+plugin.Components.CloudQLBinary.PathInArchive))
182-
binaries.CloudQlPlugin, err = os.ReadFile(baseDir + "/integarion_type/" + plugin.Components.CloudQLBinary.PathInArchive)
183-
if err != nil {
184-
logger.Error("failed to open cloudql-plugin file", zap.Error(err), zap.String("url", plugin.Components.CloudQLBinary.URI))
185-
return nil, nil, fmt.Errorf("open cloudql-plugin file for url %s: %w", plugin.IntegrationType.String(), err)
186-
}
182+
//binaries.CloudQlPlugin, err = os.ReadFile(baseDir + "/integarion_type/" + plugin.Components.CloudQLBinary.PathInArchive)
183+
//if err != nil {
184+
// logger.Error("failed to open cloudql-plugin file", zap.Error(err), zap.String("url", plugin.Components.CloudQLBinary.URI))
185+
// return nil, nil, fmt.Errorf("open cloudql-plugin file for url %s: %w", plugin.IntegrationType.String(), err)
186+
//}
187187
}
188188

189189
logger.Info("integration binaries loaded")
@@ -208,6 +208,6 @@ func ExtractIntegrationBinaries(logger *zap.Logger, plugin platformspec.PluginSp
208208
DescriberTag: describerTags,
209209
DiscoveryType: discoveryType,
210210
Tags: tagsJsonb,
211-
}, binaries,
211+
}, nil,
212212
nil
213213
}

0 commit comments

Comments
 (0)