Skip to content

Commit 0f4cacf

Browse files
committed
modified the connection string part
1 parent 8aac9ca commit 0f4cacf

6 files changed

Lines changed: 1705 additions & 244 deletions

File tree

.github/workflows/devsecops-pipeline.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ jobs:
3333

3434
- name: Run unit tests
3535
run: npm test
36+
continue-on-error: false # Fail pipeline if tests fail
3637
env:
3738
MONGO_URI: ${{ secrets.MONGO_URI }}
38-
MONGO_USERNAME: ${{ secrets.MONGO_USERNAME }}
39-
MONGO_PASSWORD: ${{ secrets.MONGO_PASSWORD }}
4039

4140
- name: Upload test results
4241
if: always()
@@ -68,8 +67,6 @@ jobs:
6867
run: npm run coverage
6968
env:
7069
MONGO_URI: ${{ secrets.MONGO_URI }}
71-
MONGO_USERNAME: ${{ secrets.MONGO_USERNAME }}
72-
MONGO_PASSWORD: ${{ secrets.MONGO_PASSWORD }}
7370

7471
- name: Upload coverage reports
7572
uses: actions/upload-artifact@v4
@@ -296,8 +293,6 @@ jobs:
296293
docker run -d --name solar-system-app \
297294
-p 3000:3000 \
298295
-e MONGO_URI="${{ secrets.MONGO_URI }}" \
299-
-e MONGO_USERNAME="${{ secrets.MONGO_USERNAME }}" \
300-
-e MONGO_PASSWORD="${{ secrets.MONGO_PASSWORD }}" \
301296
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ github.sha }}
302297
303298
# Wait for application to be ready
@@ -352,8 +347,6 @@ jobs:
352347
# -p 3000:3000 \
353348
# --restart unless-stopped \
354349
# -e MONGO_URI="${{ secrets.MONGO_URI }}" \
355-
# -e MONGO_USERNAME="${{ secrets.MONGO_USERNAME }}" \
356-
# -e MONGO_PASSWORD="${{ secrets.MONGO_PASSWORD }}" \
357350
# ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ github.sha }}
358351

359352
# # Clean up old images (keep last 3)

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ solar-system.png
33
.nyc_output
44
.talismanrc
55
coverage
6-
test-results.xml
6+
test-results.xml
7+
8+
# Environment variables (DO NOT COMMIT)
9+
.env
10+
.env.local

app-test.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,35 @@ let chaiHttp = require("chai-http");
88
chai.should();
99
chai.use(chaiHttp);
1010

11+
// Wait for MongoDB connection before running tests
12+
before(function(done) {
13+
this.timeout(15000); // Increase timeout for MongoDB connection
14+
15+
// Check if already connected
16+
if (mongoose.connection.readyState === 1) {
17+
console.log('MongoDB already connected');
18+
return done();
19+
}
20+
21+
// Wait for connection
22+
mongoose.connection.on('connected', function() {
23+
console.log('MongoDB connection established for tests');
24+
done();
25+
});
26+
27+
mongoose.connection.on('error', function(err) {
28+
console.error('MongoDB connection error:', err.message);
29+
done(err);
30+
});
31+
32+
// Timeout fallback
33+
setTimeout(function() {
34+
if (mongoose.connection.readyState !== 1) {
35+
done(new Error('MongoDB connection timeout'));
36+
}
37+
}, 14000);
38+
});
39+
1140
describe('Planets API Suite', () => {
1241

1342
describe('Fetching Planet Details', () => {

app.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ app.use(express.static(path.join(__dirname, '/')));
1414
app.use(cors())
1515

1616
mongoose.connect(process.env.MONGO_URI, {
17-
user: process.env.MONGO_USERNAME,
18-
pass: process.env.MONGO_PASSWORD,
1917
useNewUrlParser: true,
2018
useUnifiedTopology: true
2119
}, function(err) {
2220
if (err) {
2321
console.log("error!! " + err)
2422
} else {
25-
// console.log("MongoDB Connection Successful")
23+
console.log("MongoDB Connection Successful")
2624
}
2725
})
2826

0 commit comments

Comments
 (0)