Skip to content

Commit 6663e3a

Browse files
sagoezsagoez
authored
chore: renaming integrationos references to pica (#213)
1 parent 380bf19 commit 6663e3a

File tree

16 files changed

+65
-79
lines changed

16 files changed

+65
-79
lines changed

‎docker-compose.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ services:
1313
- DEMO_ACCOUNT_EVENT_ACCESS_KEY=${DEVELOPER_ACCOUNT_ACCESS_KEY}
1414
- ENGINEERING_ACCOUNT_BUILDABLE_ID=${DEVELOPER_ACCOUNT_ID}
1515
- EVENT_ACCESS_ENCRYPTION_PASSWORD=${EVENT_ACCESS_PASSWORD}
16-
- JWT_AUDIENCE=integrationos-users
16+
- JWT_AUDIENCE=pica-users
1717
- JWT_EXPIRES_AFTER=90d
18-
- JWT_ISSUER=integrationos
18+
- JWT_ISSUER=pica
1919
- JWT_SECRET=${JWT_SECRET}
2020
- MONGO_DB_NAME=events-service
21-
- MONGO_URI=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017/events-service?authSource=admin
21+
- MONGO_URI=mongodb://pica:${MONGO_PASSWORD}@mongo:27017/events-service?authSource=admin
2222
- NODE_ENV=localhost
2323
- QA_ACCOUNT_BUILDABLE_ID=build-${DEVELOPER_ACCOUNT_ID}
2424
- QA_ACCOUNT_EVENT_ACCESS_KEY=${DEVELOPER_ACCOUNT_ACCESS_KEY}
@@ -34,12 +34,12 @@ services:
3434
- ACCESS_KEY_WHITELIST_REFRESH_INTERVAL_SECS=30
3535
- CACHE_SIZE=1000
3636
- CONTROL_DATABASE_NAME=events-service
37-
- CONTROL_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
37+
- CONTROL_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
3838
- DEBUG_MODE=false
3939
- ENGINEERING_ACCOUNT_ID=${DEVELOPER_ACCOUNT_ID}
4040
- EVENT_ACCESS_PASSWORD=${EVENT_ACCESS_PASSWORD}
4141
- EVENT_DATABASE_NAME=events-service
42-
- EVENT_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
42+
- EVENT_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
4343
- GOOGLE_APPLICATION_CREDENTIALS=/root/.config/gcloud/application_default_credentials.json
4444
- GOOGLE_KMS_KEY_ID=${KMS_KEY_ID}
4545
- GOOGLE_KMS_KEY_RING_ID=${KMS_KEY_RING_ID}
@@ -61,11 +61,11 @@ services:
6161
environment:
6262
- CONTEXT_COLLECTION_NAME=event-transactions
6363
- CONTEXT_DATABASE_NAME=events-service
64-
- CONTEXT_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
64+
- CONTEXT_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
6565
- CONTROL_DATABASE_NAME=events-service
66-
- CONTROL_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
66+
- CONTROL_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
6767
- EVENT_DATABASE_NAME=events-service
68-
- EVENT_DATABASE_URL-mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
68+
- EVENT_DATABASE_URL-mongodb://pica:${MONGO_PASSWORD}@mongo:27017
6969
- GOOGLE_APPLICATION_CREDENTIALS=/root/.config/gcloud/application_default_credentials.json
7070
- GOOGLE_KMS_KEY_ID=${KMS_KEY_ID}
7171
- GOOGLE_KMS_KEY_RING_ID=${KMS_KEY_RING_ID}
@@ -86,11 +86,11 @@ services:
8686
environment:
8787
- CONTEXT_COLLECTION_NAME=event-transactions
8888
- CONTEXT_DATABASE_NAME=events-service
89-
- CONTEXT_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
89+
- CONTEXT_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
9090
- CONTROL_DATABASE_NAME=events-service
91-
- CONTROL_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
91+
- CONTROL_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
9292
- EVENT_DATABASE_NAME=events-service
93-
- EVENT_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
93+
- EVENT_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
9494
- REDIS_URL=redis://redis:6379
9595
- RUST_LOG=gateway=info,tower_http=info
9696
- SECRET=${GATEWAY_SECRET}
@@ -107,13 +107,13 @@ services:
107107
- BURST_SIZE_LIMIT=30
108108
- CONTEXT_COLLECTION_NAME=event-transactions
109109
- CONTEXT_DATABASE_NAME=events-service
110-
- CONTEXT_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
110+
- CONTEXT_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
111111
- CONTROL_DATABASE_NAME=events-service
112-
- CONTROL_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
112+
- CONTROL_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
113113
- CREATE_SECRET_PATH=http://connections-api:3005/v1/secrets
114114
- ENVIRONMENT=production
115115
- EVENT_DATABASE_NAME=events-service
116-
- EVENT_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
116+
- EVENT_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
117117
- GET_SECRET_PATH=http://connections-api:3005/v1/secrets
118118
- HOST=0.0.0.0
119119
- JWT_SECRET=${JWT_SECRET}
@@ -128,11 +128,11 @@ services:
128128
environment:
129129
- CONTEXT_COLLECTION_NAME=event-transactions
130130
- CONTEXT_DATABASE_NAME=events-service
131-
- CONTEXT_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
131+
- CONTEXT_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
132132
- CONTROL_DATABASE_NAME=events-service
133-
- CONTROL_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
133+
- CONTROL_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
134134
- EVENT_DATABASE_NAME=events-service
135-
- EVENT_DATABASE_URL=mongodb://integrationos:${MONGO_PASSWORD}@mongo:27017
135+
- EVENT_DATABASE_URL=mongodb://pica:${MONGO_PASSWORD}@mongo:27017
136136
- POLL_DURATION=1000
137137
- REDIS_URL=redis://redis:6379
138138
- RUST_LOG=watchdog=info
@@ -143,7 +143,7 @@ services:
143143
- 27017:27017
144144
environment:
145145
- MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD}
146-
- MONGO_INITDB_ROOT_USERNAME=integrationos
146+
- MONGO_INITDB_ROOT_USERNAME=pica
147147

148148
redis:
149149
image: redis:7.0

‎integrationos-api/src/domain/config.rs

+7-16
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,7 @@ pub struct ConnectionsConfig {
7777
pub rate_limit_enabled: bool,
7878
#[envconfig(from = "ENVIRONMENT", default = "development")]
7979
pub environment: Environment,
80-
#[envconfig(
81-
from = "DATABASE_CONNECTION_DOCKER_IMAGE",
82-
default = "integrationos-database"
83-
)]
80+
#[envconfig(from = "DATABASE_CONNECTION_DOCKER_IMAGE", default = "pica-database")]
8481
pub database_connection_docker_image: String,
8582
#[envconfig(from = "NAMESPACE", default = "development")]
8683
pub namespace: String,
@@ -162,29 +159,23 @@ impl Display for ConnectionsConfig {
162159

163160
#[derive(Envconfig, Default, Clone)]
164161
pub struct Headers {
165-
#[envconfig(from = "HEADER_AUTH", default = "x-integrationos-secret")]
162+
#[envconfig(from = "HEADER_AUTH", default = "x-pica-secret")]
166163
pub auth_header: String,
167-
#[envconfig(from = "HEADER_CONNECTION", default = "x-integrationos-connection-key")]
164+
#[envconfig(from = "HEADER_CONNECTION", default = "x-pica-connection-key")]
168165
pub connection_header: String,
169166
#[envconfig(
170167
from = "HEADER_ENABLE_PASSTHROUGH",
171-
default = "x-integrationos-enable-passthrough"
168+
default = "x-pica-enable-passthrough"
172169
)]
173170
pub enable_passthrough_header: String,
174-
#[envconfig(
175-
from = "HEADER_RATE_LIMIT_LIMIT",
176-
default = "x-integrationos-rate-limit-limit"
177-
)]
171+
#[envconfig(from = "HEADER_RATE_LIMIT_LIMIT", default = "x-pica-rate-limit-limit")]
178172
pub rate_limit_limit: String,
179173
#[envconfig(
180174
from = "HEADER_RATE_LIMIT_REMAINING",
181-
default = "x-integrationos-rate-limit-remainings"
175+
default = "x-pica-rate-limit-remainings"
182176
)]
183177
pub rate_limit_remaining: String,
184-
#[envconfig(
185-
from = "HEADER_RATE_LIMIT_REST",
186-
default = "x-integrationos-rate-limit-reset"
187-
)]
178+
#[envconfig(from = "HEADER_RATE_LIMIT_REST", default = "x-pica-rate-limit-reset")]
188179
pub rate_limit_reset: String,
189180
}
190181

‎integrationos-api/src/helper/shape_mongo_filter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::{collections::BTreeMap, sync::Arc};
77
pub const DELETED_STR: &str = "deleted";
88
const OWNERSHIP_STR: &str = "ownership.buildableId";
99
const ENVIRONMENT_STR: &str = "environment";
10-
const DUAL_ENVIRONMENT_HEADER: &str = "x-integrationos-show-all-environments";
10+
const DUAL_ENVIRONMENT_HEADER: &str = "x-pica-show-all-environments";
1111
const LIMIT_STR: &str = "limit";
1212
const SKIP_STR: &str = "skip";
1313

‎integrationos-api/src/logic/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub mod unified;
4545
pub mod utils;
4646
pub mod vault_connection;
4747

48-
const INTEGRATION_OS_PASSTHROUGH_HEADER: &str = "x-integrationos-passthrough";
48+
const INTEGRATION_OS_PASSTHROUGH_HEADER: &str = "x-pica-passthrough";
4949

5050
pub trait RequestExt: Sized {
5151
type Output: Serialize + DeserializeOwned + Unpin + Sync + Send + 'static;

‎integrationos-api/src/logic/openapi/builder.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ struct PathItemAction {
1212
}
1313

1414
// OPENAPI METADATA
15-
const URI: &str = "https://api.integrationos.com/v1/unified";
15+
const URI: &str = "https://api.picaos.com/v1/unified";
1616
const OPENAPI_VERSION: &str = "3.0.3";
1717
const SPEC_VERSION: &str = "1.0.0";
1818
const TITLE: &str = "Common Models";
19-
const X_INTEGRATIONOS_SECRET: &str = "X-INTEGRATIONOS-SECRET";
20-
const X_INTEGRATIONOS_CONNECTION_KEY: &str = "X-INTEGRATIONOS-CONNECTION-KEY";
21-
const X_INTEGRATIONOS_ENABLE_PASSTHROUGH: &str = "X-INTEGRATIONOS-ENABLE-PASSTHROUGH";
22-
const X_INTEGRATIONOS_PASSTHROUGH_FORWARD: &str = "X-INTEGRATIONOS-PASSTHROUGH-FORWARD";
19+
const X_PICA_SECRET: &str = "X-PICA-SECRET";
20+
const X_PICA_CONNECTION_KEY: &str = "X-PICA-CONNECTION-KEY";
21+
const X_PICA_ENABLE_PASSTHROUGH: &str = "X-PICA-ENABLE-PASSTHROUGH";
22+
const X_PICA_PASSTHROUGH_FORWARD: &str = "X-PICA-PASSTHROUGH-FORWARD";
2323

2424
pub fn generate_path_item(common_model: &CommonModel) -> IndexMap<String, ReferenceOr<PathItem>> {
2525
IndexMap::from_iter(
@@ -329,12 +329,12 @@ fn header() -> Vec<ReferenceOr<Parameter>> {
329329
vec![
330330
ReferenceOr::Item(Parameter::Header {
331331
parameter_data: ParameterData {
332-
name: X_INTEGRATIONOS_SECRET.to_string(),
333-
description: Some("IntegrationOS API key".to_string()),
332+
name: X_PICA_SECRET.to_string(),
333+
description: Some("Pica API key".to_string()),
334334
required: true,
335335
deprecated: Some(false),
336336
format: ParameterSchemaOrContent::Schema(ReferenceOr::Item(Schema {
337-
schema_data: SchemaData { default: Some(serde_json::Value::String("{{integrationos-api-key}}".into())), ..Default::default() },
337+
schema_data: SchemaData { default: Some(serde_json::Value::String("{{pica-api-key}}".into())), ..Default::default() },
338338
schema_kind: SchemaKind::Type(Type::String(StringType {
339339
format: VariantOrUnknownOrEmpty::Unknown("string".to_string()),
340340
pattern: None,
@@ -352,12 +352,12 @@ fn header() -> Vec<ReferenceOr<Parameter>> {
352352
}),
353353
ReferenceOr::Item(Parameter::Header {
354354
parameter_data: ParameterData {
355-
name: X_INTEGRATIONOS_CONNECTION_KEY.to_string(),
355+
name: X_PICA_CONNECTION_KEY.to_string(),
356356
description: Some("The unique identifier of a Connected Account".to_string()),
357357
required: true,
358358
deprecated: Some(false),
359359
format: ParameterSchemaOrContent::Schema(ReferenceOr::Item(Schema {
360-
schema_data: SchemaData { default: Some(serde_json::Value::String("{{integrationos-connection-key}}".into())), ..Default::default() },
360+
schema_data: SchemaData { default: Some(serde_json::Value::String("{{pica-connection-key}}".into())), ..Default::default() },
361361
schema_kind: SchemaKind::Type(Type::String(StringType {
362362
format: VariantOrUnknownOrEmpty::Unknown("string".to_string()),
363363
..Default::default()
@@ -372,7 +372,7 @@ fn header() -> Vec<ReferenceOr<Parameter>> {
372372
}),
373373
ReferenceOr::Item(Parameter::Header {
374374
parameter_data: ParameterData {
375-
name: X_INTEGRATIONOS_ENABLE_PASSTHROUGH.to_string(),
375+
name: X_PICA_ENABLE_PASSTHROUGH.to_string(),
376376
description: Some("Set to true to receive the exact API response from the connection platform in the passthrough object".to_string()),
377377
required: false,
378378
deprecated: Some(false),
@@ -392,7 +392,7 @@ fn header() -> Vec<ReferenceOr<Parameter>> {
392392
}),
393393
ReferenceOr::Item(Parameter::Header {
394394
parameter_data: ParameterData {
395-
name: X_INTEGRATIONOS_PASSTHROUGH_FORWARD.to_string(),
395+
name: X_PICA_PASSTHROUGH_FORWARD.to_string(),
396396
description: Some("A string of all headers to forward in the request to the 3rd-party platform".to_string()),
397397
required: false,
398398
deprecated: Some(false),

‎integrationos-api/tests/context.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use integrationos_domain::{
3131
secret::Secret,
3232
AccessKey, Claims, IntegrationOSError, SanitizedConnection, Store,
3333
};
34-
use integrationos_domain::{SecretExt, SecretVersion};
34+
use integrationos_domain::{SecretExt, SecretVersion, DEFAULT_AUDIENCE, DEFAULT_ISSUER};
3535
use jsonwebtoken::EncodingKey;
3636
use mockito::{Matcher, Server as MockServer, ServerGuard};
3737
use mongodb::Client;
@@ -248,8 +248,8 @@ impl TestServer {
248248
is_buildable_core: true,
249249
iat: 1703108904,
250250
exp: 3157463108904,
251-
aud: "buildable-users".to_string(),
252-
iss: "buildable".to_string(),
251+
aud: DEFAULT_AUDIENCE.to_string(),
252+
iss: DEFAULT_ISSUER.to_string()
253253
},
254254
&EncodingKey::from_secret(token_secret.as_bytes()),
255255
);

‎integrationos-api/tests/http/passthrough.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ async fn test_passthrough_api() {
119119
vec![
120120
(CONTENT_TYPE.to_string(), "application/json".to_string()),
121121
(
122-
"x-integrationos-connection-key".to_string(),
122+
"x-pica-connection-key".to_string(),
123123
connection.key.to_string(),
124124
),
125125
]
@@ -146,7 +146,7 @@ async fn test_passthrough_api() {
146146
vec![
147147
(CONTENT_TYPE.to_string(), "application/json".to_string()),
148148
(
149-
"x-integrationos-connection-key".to_string(),
149+
"x-pica-connection-key".to_string(),
150150
connection.key.to_string(),
151151
),
152152
]

‎integrationos-api/tests/http/unified.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ async fn test_unified_api_get_many() {
6363
vec![
6464
(CONTENT_TYPE.to_string(), "application/json".to_string()),
6565
(
66-
"x-integrationos-connection-key".to_string(),
66+
"x-pica-connection-key".to_string(),
6767
connection.key.to_string(),
6868
),
6969
]
@@ -121,7 +121,7 @@ async fn test_unified_api_get_one() {
121121
vec![
122122
(CONTENT_TYPE.to_string(), "application/json".to_string()),
123123
(
124-
"x-integrationos-connection-key".to_string(),
124+
"x-pica-connection-key".to_string(),
125125
connection.key.to_string(),
126126
),
127127
]
@@ -177,7 +177,7 @@ async fn test_unified_api_get_count() {
177177
vec![
178178
(CONTENT_TYPE.to_string(), "application/json".to_string()),
179179
(
180-
"x-integrationos-connection-key".to_string(),
180+
"x-pica-connection-key".to_string(),
181181
connection.key.to_string(),
182182
),
183183
]
@@ -237,7 +237,7 @@ async fn test_unified_api_update() {
237237
vec![
238238
(CONTENT_TYPE.to_string(), "application/json".to_string()),
239239
(
240-
"x-integrationos-connection-key".to_string(),
240+
"x-pica-connection-key".to_string(),
241241
connection.key.to_string(),
242242
),
243243
]
@@ -295,7 +295,7 @@ async fn test_unified_api_delete() {
295295
vec![
296296
(CONTENT_TYPE.to_string(), "application/json".to_string()),
297297
(
298-
"x-integrationos-connection-key".to_string(),
298+
"x-pica-connection-key".to_string(),
299299
connection.key.to_string(),
300300
),
301301
]
@@ -353,7 +353,7 @@ async fn test_unified_api_create() {
353353
vec![
354354
(CONTENT_TYPE.to_string(), "application/json".to_string()),
355355
(
356-
"x-integrationos-connection-key".to_string(),
356+
"x-pica-connection-key".to_string(),
357357
connection.key.to_string(),
358358
),
359359
]
@@ -400,7 +400,7 @@ async fn test_unified_metrics() {
400400
vec![
401401
(CONTENT_TYPE.to_string(), "application/json".to_string()),
402402
(
403-
"x-integrationos-connection-key".to_string(),
403+
"x-pica-connection-key".to_string(),
404404
connection.key.to_string(),
405405
),
406406
]
@@ -433,7 +433,7 @@ async fn test_unified_metrics() {
433433
vec![
434434
(CONTENT_TYPE.to_string(), "application/json".to_string()),
435435
(
436-
"x-integrationos-connection-key".to_string(),
436+
"x-pica-connection-key".to_string(),
437437
connection.key.to_string(),
438438
),
439439
]

‎integrationos-api/tests/worker/gateway.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl TestGateway {
7070
let req = self
7171
.client
7272
.post(format!("http://localhost:{}/emit", self.port))
73-
.header("x-buildable-secret", key)
73+
.header("x-pica-secret", key)
7474
.json(&json!({"event": name, "payload": payload}));
7575

7676
let res = req.send().await?;

‎integrationos-cache/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "integrationos-cache"
3-
description = "Cache library for IntegrationOS"
3+
description = "Cache library for Pica"
44
version = "0.1.0"
55
edition = "2021"
66

‎integrationos-domain/src/domain/http/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use chrono::Utc;
44
use jsonwebtoken::{EncodingKey, Header};
55
use serde::{Deserialize, Serialize};
66

7-
pub const DEFAULT_AUDIENCE: &str = "integrationos-users";
8-
pub const DEFAULT_ISSUER: &str = "integrationos";
7+
pub const DEFAULT_AUDIENCE: &str = "pica-users";
8+
pub const DEFAULT_ISSUER: &str = "pica";
99

10-
pub const FALLBACK_AUDIENCE: &str = "buildable-users";
11-
pub const FALLBACK_ISSUER: &str = "buildable";
10+
pub const FALLBACK_AUDIENCE: &str = "pica-users";
11+
pub const FALLBACK_ISSUER: &str = "pica";
1212

1313
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Hash, Default)]
1414
#[serde(rename_all = "camelCase")]

‎integrationos-gateway/src/main.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ use tracing::info;
1111
async fn main() -> Result<()> {
1212
dotenv().ok();
1313

14-
let suscriber = get_subscriber(
15-
"integrationos-gateway".into(),
16-
"info".into(),
17-
std::io::stdout,
18-
None,
19-
);
14+
let suscriber = get_subscriber("gateway".into(), "info".into(), std::io::stdout, None);
2015
init_subscriber(suscriber);
2116

2217
let config = Config::init_from_env()?;

0 commit comments

Comments
 (0)